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

src/main/java/com/ekexiu/operation/push/getui/Message.java

@@ -0,0 +1,65 @@
package com.ekexiu.operation.push.getui;
import com.google.gson.annotations.SerializedName;
public class Message {
	
	//注册应用时生成的appkey 
	@SerializedName("appkey")
	private String appKey;
	//是否离线推送 
	@SerializedName("is_offline")
	private boolean isOffline = true;
	//消息应用类型，可选项：notification、link、notypopload、transmission
	private String msgtype;
	//消息离线存储有效期，单位：ms
	@SerializedName("offline_expire_time")
	private int offlineExpireTime = 1000*60*60*24;
	//选择推送消息使用网络类型，0：不限制，1：wifi
	
	@SerializedName("push_network_type")
	private int pushNetworkType = 0;
	public String getAppKey() {
		return appKey;
	}
	public void setAppKey(String appKey) {
		this.appKey = appKey;
	}
	public boolean isOffline() {
		return isOffline;
	}
	public void setOffline(boolean isOffline) {
		this.isOffline = isOffline;
	}
	public String getMsgtype() {
		return msgtype;
	}
	public void setMsgtype(String msgtype) {
		this.msgtype = msgtype;
	}
	public int getOfflineExpireTime() {
		return offlineExpireTime;
	}
	public void setOfflineExpireTime(int offlineExpireTime) {
		this.offlineExpireTime = offlineExpireTime;
	}
	public int getPushNetworkType() {
		return pushNetworkType;
	}
	public void setPushNetworkType(int pushNetworkType) {
		this.pushNetworkType = pushNetworkType==0?0:1;
	}
	
	
	
}

src/main/java/com/ekexiu/operation/push/getui/MsgCondition.java

@@ -0,0 +1,34 @@
package com.ekexiu.operation.push.getui;
import com.google.gson.annotations.SerializedName;
public class MsgCondition {
	private String key;
	private String[] values;
	@SerializedName("opt_type")
	private int optType;
	public String getKey() {
		return key;
	}
	public void setKey(String key) {
		this.key = key;
	}
	public String[] getValues() {
		return values;
	}
	public void setValues(String[] values) {
		this.values = values;
	}
	public int getOptType() {
		return optType;
	}
	public void setOptType(int optType) {
		this.optType = optType;
	}
	public MsgCondition(String key,String[] values,int optType){
		this.key = key;
		this.values = values;
		this.optType = optType;
	}
	
}

src/main/java/com/ekexiu/operation/push/getui/MsgStyle.java

@@ -0,0 +1,73 @@
package com.ekexiu.operation.push.getui;
import com.google.gson.annotations.SerializedName;
public class MsgStyle {
	//type 	integer 	是 	固定为1
	private int type=1;
	//text 	String 	是 	通知内容
	private String text;
	//title 	String 	是 	通知标题
	private String title;
	//logo 	String 	是 	通知的图标名称，包含后缀名（需要在客户端开发时嵌入），如“push.png”
	private String logo;
	//logourl 	String 	否 	通知图标URL地址
	private String logourl;
	//is_ring 	boolean 	否 	收到通知是否响铃：true响铃，false不响铃。默认响铃
	@SerializedName("is_ring")
	private boolean ring=true;
	//is_vibrate 	boolean 	否 	收到通知是否振动：true振动，false不振动。默认振动
	@SerializedName("is_vibrate")
	private boolean vibrate = true;
	//is_clearable 	boolean 	否 	通知是否可清除： true可清除，false不可清除。默认可清除	
	@SerializedName("is_clearable")
	private boolean clearable;
	public int getType() {
		return type;
	}
	public void setType(int type) {
		this.type = type;
	}
	public String getText() {
		return text;
	}
	public void setText(String text) {
		this.text = text;
	}
	public String getTitle() {
		return title;
	}
	public void setTitle(String title) {
		this.title = title;
	}
	public String getLogo() {
		return logo;
	}
	public void setLogo(String logo) {
		this.logo = logo;
	}
	public String getLogourl() {
		return logourl;
	}
	public void setLogourl(String logourl) {
		this.logourl = logourl;
	}
	public boolean isRing() {
		return ring;
	}
	public void setRing(boolean ring) {
		this.ring = ring;
	}
	public boolean isVibrate() {
		return vibrate;
	}
	public void setVibrate(boolean vibrate) {
		this.vibrate = vibrate;
	}
	public boolean isClearable() {
		return clearable;
	}
	public void setClearable(boolean clearable) {
		this.clearable = clearable;
	}
}

src/main/java/com/ekexiu/operation/push/getui/NotificationMessage.java

@@ -0,0 +1,53 @@
package com.ekexiu.operation.push.getui;
import com.google.gson.annotations.SerializedName;
public class NotificationMessage {
	//transmission_type 	boolean 	否 	收到消息是否立即启动应用，true为立即启动，false则广播等待启动，默认是否
	@SerializedName("transmission_type")
	private boolean transmissionType=false;
	
	//transmission_content 	String 	否 	透传内容
	@SerializedName("transmission_content")
	private String transmissionContent;
	
	//duration_begin 	String 	否 	设定展示开始时间，格式为yyyy-MM-dd HH:mm:ss
	@SerializedName("duration_begin")
	private String durationBegin;
	
	//duration_end 	String 	否 	设定展示结束时间，格式为yyyy-MM-dd HH:mm:ss
	@SerializedName("duration_end")
	private String durationEnd;
	//style 	Style 	是 	通知栏消息布局样式，见底下Style说明
	private MsgStyle style;
	public boolean isTransmissionType() {
		return transmissionType;
	}
	public void setTransmissionType(boolean transmissionType) {
		this.transmissionType = transmissionType;
	}
	public String getTransmissionContent() {
		return transmissionContent;
	}
	public void setTransmissionContent(String transmissionContent) {
		this.transmissionContent = transmissionContent;
	}
	public String getDurationBegin() {
		return durationBegin;
	}
	public void setDurationBegin(String durationBegin) {
		this.durationBegin = durationBegin;
	}
	public String getDurationEnd() {
		return durationEnd;
	}
	public void setDurationEnd(String durationEnd) {
		this.durationEnd = durationEnd;
	}
	public MsgStyle getStyle() {
		return style;
	}
	public void setStyle(MsgStyle style) {
		this.style = style;
	}
}

src/main/java/com/ekexiu/operation/push/getui/PushMessage.java

@@ -0,0 +1,16 @@
package com.ekexiu.operation.push.getui;
public class PushMessage {
	private final Message message;
	
	private NotificationMessage notification;
	private TransmissionMessage transmission;
	
	private String requestid;
	private String alias;
	
	public PushMessage(){
		this.message = new Message();
	}
	
}

src/main/java/com/ekexiu/operation/push/getui/TransmissionMessage.java

@@ -0,0 +1,57 @@
package com.ekexiu.operation.push.getui;
import java.util.Map;
import com.google.gson.annotations.SerializedName;
public class TransmissionMessage {
	//transmission_type 	boolean 	否 	收到消息是否立即启动应用，true为立即启动，false则广播等待启动，默认是否
	@SerializedName("transmission_type")
	private boolean transmissionType=false;
	
	//transmission_content 	String 	否 	透传内容
	@SerializedName("transmission_content")
	private String transmissionContent;
	
	//duration_begin 	String 	否 	设定展示开始时间，格式为yyyy-MM-dd HH:mm:ss
	@SerializedName("duration_begin")
	private String durationBegin;
	
	//duration_end 	String 	否 	设定展示结束时间，格式为yyyy-MM-dd HH:mm:ss
	@SerializedName("duration_end")
	private String durationEnd;
	//push_info 	Map 	否 	APNs消息内容
	@SerializedName("push_info")
	private Map<String,Object> pushInfo;
	public boolean isTransmissionType() {
		return transmissionType;
	}
	public void setTransmissionType(boolean transmissionType) {
		this.transmissionType = transmissionType;
	}
	public String getTransmissionContent() {
		return transmissionContent;
	}
	public void setTransmissionContent(String transmissionContent) {
		this.transmissionContent = transmissionContent;
	}
	public String getDurationBegin() {
		return durationBegin;
	}
	public void setDurationBegin(String durationBegin) {
		this.durationBegin = durationBegin;
	}
	public String getDurationEnd() {
		return durationEnd;
	}
	public void setDurationEnd(String durationEnd) {
		this.durationEnd = durationEnd;
	}
	public Map<String, Object> getPushInfo() {
		return pushInfo;
	}
	public void setPushInfo(Map<String, Object> pushInfo) {
		this.pushInfo = pushInfo;
	}
	
}

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

@@ -92,6 +92,11 @@ public abstract class ArticleDao {
	@Where("STATUS = '1'")
	public abstract List<Article> queryProPublish(Connection con, String professorId) throws SQLException;
	
	@PageSelect
	@OrderBy(" ORDER BY MODIFY_TIME DESC ")
	@Where("STATUS = '1'")
	public abstract PageQueryResult<Article> pageQueryProPublish(Connection con, String professorId,int pageSize,int pageNo) throws SQLException;
	
	@SelectList
	@OrderBy(" ORDER BY MODIFY_TIME DESC ")
	@Where("STATUS IN ('0','1','2')")
@@ -106,6 +111,11 @@ public abstract class ArticleDao {
	@Where("STATUS = '1'")
	public abstract List<Article> queryOrgPublish(Connection con, String orgId) throws SQLException;
	
	@PageSelect
	@OrderBy(" ORDER BY MODIFY_TIME DESC ")
	@Where("STATUS = '1'")
	public abstract PageQueryResult<Article> pageQueryOrgPublish(Connection con, String orgId,int pageSize,int pageNo) throws SQLException;
	
	@LimitSelect
	@OrderBy(" ORDER BY MODIFY_TIME DESC ")
	public abstract List<Article> queryLimit(Connection con,String orgId,@LessThan String modifyTime,int rows)throws SQLException;
@@ -118,7 +128,7 @@ public abstract class ArticleDao {
		int index = 1;
		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 FROM ARTICLE");
		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 != ?");
@@ -181,6 +191,7 @@ public abstract class ArticleDao {
                    article.setStatus(status);
                    article.setCreateTime(rs.getString(13));
                    article.setModifyTime(rs.getString(14));
                    article.setShareId(rs.getLong(15));
					articles.add(article);
				}
				return articles;
@@ -198,7 +209,7 @@ public abstract class ArticleDao {
		boolean hasOrgId = null != orgId;
		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 FROM ARTICLE");
		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(hasProId){
			sql.append(" AND PROFESSOR_ID = ?");
@@ -273,6 +284,7 @@ public abstract class ArticleDao {
                    article.setStatus(status);
                    article.setCreateTime(rs.getString(13));
                    article.setModifyTime(rs.getString(14));
                    article.setShareId(rs.getLong(15));
					articles.add(article);
				}
				return articles;
@@ -289,7 +301,7 @@ public abstract class ArticleDao {
		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 FROM ARTICLE");
		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 != ?");
@@ -367,6 +379,7 @@ public abstract class ArticleDao {
                    article.setStatus(status);
                    article.setCreateTime(rs.getString(13));
                    article.setModifyTime(rs.getString(14));
                    article.setShareId(rs.getLong(15));
					articles.add(article);
				}
				return articles;
@@ -430,7 +443,7 @@ public abstract class ArticleDao {
        if(firstPage){
            queryResult.setPageNo(1);
            sql = new StringBuilder();
            sql.append("SELECT ARTICLE_ID,PROFESSOR_ID,ARTICLE_TITLE,ARTICLE_CONTENT,SUBJECT,INDUSTRY,PUBLISH_TIME,ARTICLE_IMG,ORG_ID,ARTICLE_TYPE,ARTICLE_AGREE,PAGE_VIEWS,STATUS,CREATE_TIME,MODIFY_TIME FROM ARTICLE");
            sql.append("SELECT ARTICLE_ID,PROFESSOR_ID,ARTICLE_TITLE,ARTICLE_CONTENT,SUBJECT,INDUSTRY,PUBLISH_TIME,ARTICLE_IMG,ORG_ID,ARTICLE_TYPE,ARTICLE_AGREE,PAGE_VIEWS,STATUS,CREATE_TIME,MODIFY_TIME,SHARE_ID FROM ARTICLE");
            sql.append(whereSql);
            sql.append(" ORDER BY PUBLISH_TIME DESC");
            sql.append(" LIMIT ").append(pageSize);
@@ -446,7 +459,7 @@ public abstract class ArticleDao {
            --pageNo;
            int offset = (pageNo * pageSize);
            sql = new StringBuilder();
            sql.append("SELECT ARTICLE_ID,PROFESSOR_ID,ARTICLE_TITLE,ARTICLE_CONTENT,SUBJECT,INDUSTRY,PUBLISH_TIME,ARTICLE_IMG,ORG_ID,ARTICLE_TYPE,ARTICLE_AGREE,PAGE_VIEWS,STATUS,CREATE_TIME,MODIFY_TIME FROM ARTICLE");
            sql.append("SELECT ARTICLE_ID,PROFESSOR_ID,ARTICLE_TITLE,ARTICLE_CONTENT,SUBJECT,INDUSTRY,PUBLISH_TIME,ARTICLE_IMG,ORG_ID,ARTICLE_TYPE,ARTICLE_AGREE,PAGE_VIEWS,STATUS,CREATE_TIME,MODIFY_TIME,SHARE_ID FROM ARTICLE");
            sql.append(whereSql);
            sql.append(" ORDER BY PUBLISH_TIME DESC");
            sql.append(" LIMIT ").append(pageSize).append(" OFFSET ").append(offset);
@@ -519,6 +532,7 @@ public abstract class ArticleDao {
                    article.setStatus(status);
                    article.setCreateTime(rs.getString(14));
                    article.setModifyTime(rs.getString(15));
                    article.setShareId(rs.getLong(16));
                    articles.add(article);
                }
                return queryResult;
@@ -581,7 +595,7 @@ public abstract class ArticleDao {
        if(firstPage){
        	queryResult.setPageNo(1);
        	sql = new StringBuilder();
        	sql.append("(SELECT ARTICLE_ID,PROFESSOR_ID,ARTICLE_TITLE,ARTICLE_CONTENT,SUBJECT,INDUSTRY,PUBLISH_TIME,ARTICLE_IMG,ORG_ID,ARTICLE_TYPE,ARTICLE_AGREE,PAGE_VIEWS,STATUS,CREATE_TIME,MODIFY_TIME FROM ARTICLE WHERE STATUS IN('0','2')");
        	sql.append("(SELECT ARTICLE_ID,PROFESSOR_ID,ARTICLE_TITLE,ARTICLE_CONTENT,SUBJECT,INDUSTRY,PUBLISH_TIME,ARTICLE_IMG,ORG_ID,ARTICLE_TYPE,ARTICLE_AGREE,PAGE_VIEWS,STATUS,CREATE_TIME,MODIFY_TIME,SHARE_ID FROM ARTICLE WHERE STATUS IN('0','2')");
        	if(hasProfessorId){
            	sql.append(" AND PROFESSOR_ID = ?");
            }
@@ -591,7 +605,7 @@ public abstract class ArticleDao {
        	if(hasArticleTitle){
        		sql.append(" AND ARTICLE_TITLE LIKE ?");
        	}
        	sql.append(" ORDER BY MODIFY_TIME DESC) UNION ALL (SELECT ARTICLE_ID,PROFESSOR_ID,ARTICLE_TITLE,ARTICLE_CONTENT,SUBJECT,INDUSTRY,PUBLISH_TIME,ARTICLE_IMG,ORG_ID,ARTICLE_TYPE,ARTICLE_AGREE,PAGE_VIEWS,STATUS,CREATE_TIME,MODIFY_TIME FROM ARTICLE WHERE STATUS = '1'");
        	sql.append(" ORDER BY MODIFY_TIME DESC) UNION ALL (SELECT ARTICLE_ID,PROFESSOR_ID,ARTICLE_TITLE,ARTICLE_CONTENT,SUBJECT,INDUSTRY,PUBLISH_TIME,ARTICLE_IMG,ORG_ID,ARTICLE_TYPE,ARTICLE_AGREE,PAGE_VIEWS,STATUS,CREATE_TIME,MODIFY_TIME,SHARE_ID FROM ARTICLE WHERE STATUS = '1'");
        	if(hasProfessorId){
            	sql.append(" AND PROFESSOR_ID = ?");
            }
@@ -615,7 +629,7 @@ public abstract class ArticleDao {
            --pageNo;
            int offset = (pageNo * pageSize);
            sql = new StringBuilder();
            sql.append("(SELECT ARTICLE_ID,PROFESSOR_ID,ARTICLE_TITLE,ARTICLE_CONTENT,SUBJECT,INDUSTRY,PUBLISH_TIME,ARTICLE_IMG,ORG_ID,ARTICLE_TYPE,ARTICLE_AGREE,PAGE_VIEWS,STATUS,CREATE_TIME,MODIFY_TIME FROM ARTICLE WHERE STATUS IN('0','2')");
            sql.append("(SELECT ARTICLE_ID,PROFESSOR_ID,ARTICLE_TITLE,ARTICLE_CONTENT,SUBJECT,INDUSTRY,PUBLISH_TIME,ARTICLE_IMG,ORG_ID,ARTICLE_TYPE,ARTICLE_AGREE,PAGE_VIEWS,STATUS,CREATE_TIME,MODIFY_TIME,SHARE_ID FROM ARTICLE WHERE STATUS IN('0','2')");
        	if(hasProfessorId){
            	sql.append(" AND PROFESSOR_ID = ?");
            }
@@ -625,7 +639,7 @@ public abstract class ArticleDao {
        	if(hasArticleTitle){
        		sql.append(" AND ARTICLE_TITLE LIKE ?");
        	}
        	sql.append(" ORDER BY MODIFY_TIME DESC) UNION ALL (SELECT ARTICLE_ID,PROFESSOR_ID,ARTICLE_TITLE,ARTICLE_CONTENT,SUBJECT,INDUSTRY,PUBLISH_TIME,ARTICLE_IMG,ORG_ID,ARTICLE_TYPE,ARTICLE_AGREE,PAGE_VIEWS,STATUS,CREATE_TIME,MODIFY_TIME FROM ARTICLE WHERE STATUS = '1'");
        	sql.append(" ORDER BY MODIFY_TIME DESC) UNION ALL (SELECT ARTICLE_ID,PROFESSOR_ID,ARTICLE_TITLE,ARTICLE_CONTENT,SUBJECT,INDUSTRY,PUBLISH_TIME,ARTICLE_IMG,ORG_ID,ARTICLE_TYPE,ARTICLE_AGREE,PAGE_VIEWS,STATUS,CREATE_TIME,MODIFY_TIME,SHARE_ID FROM ARTICLE WHERE STATUS = '1'");
        	if(hasProfessorId){
            	sql.append(" AND PROFESSOR_ID = ?");
            }
@@ -718,6 +732,7 @@ public abstract class ArticleDao {
                    article.setStatus(status);
                    article.setCreateTime(rs.getString(14));
                    article.setModifyTime(rs.getString(15));
                    article.setShareId(rs.getLong(16));
                    articles.add(article);
                }
                return queryResult;
@@ -900,5 +915,9 @@ public abstract class ArticleDao {
            try{ps.close();}catch(Exception e4){}
        }
    }
	
	@SelectOne
	@Nullable
	public abstract Article query(Connection con ,long shareId)throws SQLException;
}

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

@@ -0,0 +1,16 @@
package com.ekexiu.portal.dao;
import java.sql.Connection;
import java.sql.SQLException;
import org.jfw.apt.orm.annotation.dao.DAO;
import org.jfw.apt.orm.annotation.dao.method.operator.InsertAndGenKey;
import com.ekexiu.portal.po.Feedback;
@DAO
public interface FeedbackDao {
	@InsertAndGenKey(value = "id")
	long insert(Connection con, Feedback fb) throws SQLException;
}

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

@@ -1,8 +1,6 @@
package com.ekexiu.portal.dao;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.List;
@@ -10,19 +8,27 @@ 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.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.Where;
import org.jfw.apt.orm.annotation.dao.method.operator.DeleteWith;
import org.jfw.apt.orm.annotation.dao.method.operator.Insert;
import org.jfw.apt.orm.annotation.dao.method.operator.LimitQuery;
import org.jfw.apt.orm.annotation.dao.method.operator.PageQuery;
import org.jfw.apt.orm.annotation.dao.method.operator.PageSelect;
import org.jfw.apt.orm.annotation.dao.method.operator.QueryList;
import org.jfw.apt.orm.annotation.dao.method.operator.QueryOne;
import org.jfw.apt.orm.annotation.dao.method.operator.QueryVal;
import org.jfw.apt.orm.annotation.dao.method.operator.SelectList;
import org.jfw.apt.orm.annotation.dao.method.operator.SelectOne;
import org.jfw.apt.orm.annotation.dao.method.operator.Update;
import org.jfw.apt.orm.annotation.dao.method.operator.UpdateWith;
import org.jfw.apt.orm.annotation.dao.param.In;
import org.jfw.apt.orm.annotation.dao.param.Like;
import org.jfw.apt.orm.annotation.dao.param.Set;
import org.jfw.apt.orm.annotation.dao.param.SqlColumn;
import org.jfw.apt.orm.core.defaultImpl.StringHandler;
import org.jfw.util.PageQueryResult;
@@ -32,145 +38,193 @@ import com.ekexiu.portal.pojo.EditOrganization;
@DAO
public abstract class OrgDao {
	
	@Insert
	public abstract int insert(Connection con, Organization org)throws SQLException;
	
	public abstract int insert(Connection con, Organization org) throws SQLException;
	@UpdateWith
	@From(Organization.class)
	public abstract int updateIsJoin(Connection con,String id,@Set String isJoin)throws SQLException;
	
	public abstract int updateIsJoin(Connection con, String id, @Set String isJoin) throws SQLException;
	@UpdateWith
	@From(Organization.class)
	public abstract int updateAuthStatus(Connection con,String id,@Set String authStatus)throws SQLException;
	
	public abstract int updateAuthStatus(Connection con, String id, @Set String authStatus) throws SQLException;
	@Update
	public abstract int update(Connection con,Organization org)throws SQLException;
	
	public abstract int update(Connection con, Organization org) throws SQLException;
	@Nullable
	@SelectOne
	public abstract Organization query(Connection con,String id) throws SQLException;
	
	public EditOrganization queryEditOrg(Connection con,String id) throws SQLException{
        int index = 1;
        String sql = "SELECT FOR_SHORT,ORG_URL,FOUND_TIME,PROVINCE,CITY,SUBJECT,INDUSTRY,ORG_SIZE,QUALIFICATION,IS_JOIN,AUTH_STATUS,ORG_ATTR,ID,NAME,ORG_TYPE,CREATE_TIME,MODIFY_TIME,DESCP FROM ORGANIZATION WHERE ID = ?";
        PreparedStatement ps = con.prepareStatement(sql);
        try{
            ps.setString(index++,id);
            ResultSet rs = ps.executeQuery();
            try{
                if(rs.next()){
                    EditOrganization editOrg = new EditOrganization();
                    String forShort = rs.getString(1);
                    if(rs.wasNull()){
                    	forShort = null;
                    }
                    editOrg.setForShort(forShort);
                    String orgUrl = rs.getString(2);
                    if(rs.wasNull()){
                    	orgUrl = null;
                    }
                    editOrg.setOrgUrl(orgUrl);
                    String foundTime = rs.getString(3);
                    if(rs.wasNull()){
                    	foundTime = null;
                    }
                    editOrg.setFoundTime(foundTime);
                    String province = rs.getString(4);
                    if(rs.wasNull()){
                    	province = null;
                    }
                    editOrg.setProvince(province);
                    String city = rs.getString(5);
                    if(rs.wasNull()){
                    	city = null;
                    }
                    editOrg.setCity(city);
                    String subject = rs.getString(6);
                    if(rs.wasNull()){
                    	subject = null;
                    }
                    editOrg.setSubject(subject);
                    String industry = rs.getString(7);
                    if(rs.wasNull()){
                    	industry = null;
                    }
                    editOrg.setIndustry(industry);
                    String orgSize = rs.getString(8);
                    if(rs.wasNull()){
                    	orgSize = null;
                    }
                    editOrg.setOrgSize(orgSize);
                    String qualification = rs.getString(9);
                    if(rs.wasNull()){
                    	qualification = null;
                    }
                    editOrg.setQualification(qualification);
                    editOrg.setIsJoin(rs.getString(10));
                    editOrg.setAuthStatus(rs.getString(11));
                    String orgAttr = rs.getString(12);
                    if(rs.wasNull()){
                    	orgAttr = null;
                    }
                    editOrg.setOrgAttr(orgAttr);
                    editOrg.setId(rs.getString(13));
                    editOrg.setName(rs.getString(14));
                    String orgType = rs.getString(15);
                    if(rs.wasNull()){
                    	orgType = null;
                    }
                    editOrg.setOrgType(orgType);
                    editOrg.setCreateTime(rs.getString(16));
                    editOrg.setModifyTime(rs.getString(17));
                    String descp = rs.getString(18);
                    if(rs.wasNull()){
                    	descp = null;
                    }
                    editOrg.setDescp(descp);
                    return editOrg;
                }else{
                    return null;
                }
            }finally{
                try{rs.close();}catch(Exception e1){}
            }
        }finally{
            try{ps.close();}catch(Exception e2){}
        }
    }
	
	public abstract Organization query(Connection con, String id) throws SQLException;
	@Nullable
	@QueryOne
	@From(Organization.class)
	@Select(Organization.class)
	public abstract EditOrganization queryEditOrg(Connection con, String id) throws SQLException;
	// public EditOrganization queryEditOrg(Connection con,String id) throws
	// SQLException{
	// int index = 1;
	// String sql = "SELECT
	// FOR_SHORT,ORG_URL,FOUND_TIME,PROVINCE,CITY,SUBJECT,INDUSTRY,ORG_SIZE,QUALIFICATION,IS_JOIN,AUTH_STATUS,ORG_ATTR,ID,NAME,ORG_TYPE,CREATE_TIME,MODIFY_TIME,DESCP
	// FROM ORGANIZATION WHERE ID = ?";
	// PreparedStatement ps = con.prepareStatement(sql);
	// try{
	// ps.setString(index++,id);
	// ResultSet rs = ps.executeQuery();
	// try{
	// if(rs.next()){
	// EditOrganization editOrg = new EditOrganization();
	// String forShort = rs.getString(1);
	// if(rs.wasNull()){
	// forShort = null;
	// }
	// editOrg.setForShort(forShort);
	// String orgUrl = rs.getString(2);
	// if(rs.wasNull()){
	// orgUrl = null;
	// }
	// editOrg.setOrgUrl(orgUrl);
	// String foundTime = rs.getString(3);
	// if(rs.wasNull()){
	// foundTime = null;
	// }
	// editOrg.setFoundTime(foundTime);
	// String province = rs.getString(4);
	// if(rs.wasNull()){
	// province = null;
	// }
	// editOrg.setProvince(province);
	// String city = rs.getString(5);
	// if(rs.wasNull()){
	// city = null;
	// }
	// editOrg.setCity(city);
	// String subject = rs.getString(6);
	// if(rs.wasNull()){
	// subject = null;
	// }
	// editOrg.setSubject(subject);
	// String industry = rs.getString(7);
	// if(rs.wasNull()){
	// industry = null;
	// }
	// editOrg.setIndustry(industry);
	// String orgSize = rs.getString(8);
	// if(rs.wasNull()){
	// orgSize = null;
	// }
	// editOrg.setOrgSize(orgSize);
	// String qualification = rs.getString(9);
	// if(rs.wasNull()){
	// qualification = null;
	// }
	// editOrg.setQualification(qualification);
	// editOrg.setIsJoin(rs.getString(10));
	// editOrg.setAuthStatus(rs.getString(11));
	// String orgAttr = rs.getString(12);
	// if(rs.wasNull()){
	// orgAttr = null;
	// }
	// editOrg.setOrgAttr(orgAttr);
	// editOrg.setId(rs.getString(13));
	// editOrg.setName(rs.getString(14));
	// String orgType = rs.getString(15);
	// if(rs.wasNull()){
	// orgType = null;
	// }
	// editOrg.setOrgType(orgType);
	// editOrg.setCreateTime(rs.getString(16));
	// editOrg.setModifyTime(rs.getString(17));
	// String descp = rs.getString(18);
	// if(rs.wasNull()){
	// descp = null;
	// }
	// editOrg.setDescp(descp);
	// return editOrg;
	// }else{
	// return null;
	// }
	// }finally{
	// try{rs.close();}catch(Exception e1){}
	// }
	// }finally{
	// try{ps.close();}catch(Exception e2){}
	// }
	// }
	//
	@SelectList
	public abstract List<Organization> query(Connection con)throws SQLException;
	public abstract List<Organization> query(Connection con) throws SQLException;
	@LimitQuery
	public abstract List<Organization> limitQuery(Connection con, @Like String name,int rows)throws SQLException;
	
	public abstract List<Organization> limitQuery(Connection con, @Like String name, int rows) throws SQLException;
	@LimitQuery
	@From(Organization.class)
	@OrderBy("ORDER BY NAME")
	@Select(Organization.class)
	public abstract List<EditOrganization> queryLimit(Connection con,@Like String name,int rows)throws SQLException;
	
	public abstract List<EditOrganization> queryLimit(Connection con, @Like String name, int rows) throws SQLException;
	@Nullable
	@QueryVal
	@Column(handlerClass=StringHandler.class,value="id")
	@Column(handlerClass = StringHandler.class, value = "id")
	@From(Organization.class)
	public abstract String queryByName(Connection con,String name)throws SQLException;
	
	public abstract String queryByName(Connection con, String name) throws SQLException;
	@Nullable
	@QueryVal
	@Column(handlerClass=StringHandler.class,value="auth_status")
	@Column(handlerClass = StringHandler.class, value = "auth_status")
	@From(Organization.class)
	public abstract String queryAuthStatus(Connection con,String id)throws SQLException;
	
	public abstract String queryAuthStatus(Connection con, String id) throws SQLException;
	@PageSelect
	public abstract PageQueryResult<Organization> query(Connection con,@Nullable  @Like String name,@Nullable String orgType,int pageSize,int pageNo) throws SQLException;
	public abstract PageQueryResult<Organization> query(Connection con, @Nullable @Like String name, @Nullable String orgType, int pageSize, int pageNo)
			throws SQLException;
	@From(Organization.class)
	@LimitQuery
	public abstract List<BaseOrganization> query(Connection con,@Nullable @Like String name,int rows) throws SQLException;
	
	public abstract List<BaseOrganization> query(Connection con, @Nullable @Like String name, int rows) throws SQLException;
	@From(Organization.class)
	@DeleteWith
	public abstract int delete(Connection con,String id)throws SQLException;
	public abstract int delete(Connection con, String id) throws SQLException;
	@From(Organization.class)
	@UpdateWith
	public abstract int updateSortNum(Connection con, String id, @Set long sortNum) throws SQLException;
	@From(Organization.class)
	@UpdateWith
	@SetSentence("PAGE_VIEWS = PAGE_VIEWS + 1")
	public abstract int incPageViews(Connection con, String id) throws SQLException;
	@SelectOne
	@Nullable
	public abstract Organization query(Connection con, long shareId) throws SQLException;
	@PageQuery
	@From(Organization.class)
	@OrderBy("ORDER BY SORT_NUM DESC,MODIFY_TIME DESC")
	@Select(Organization.class)
	@Or
	public abstract PageQueryResult<EditOrganization> query(Connection con,
			@SqlColumn(handlerClass = StringHandler.class, value = { "(NAME LIKE ? AND IS_JOIN ='1')", "(FOR_SHORT LIKE ? AND IS_JOIN ='1')",
					"(DESCP LIKE ?  AND IS_JOIN ='1')", "(SUBJECT LIKE ? AND IS_JOIN ='1') ", "(industry LIKE ?  AND IS_JOIN ='1')",
					"(ID IN (SELECT ORG_ID FROM RESOURCE WHERE RESOURCE_TYPE='2' AND RESOURCE_NAME LIKE ?) AND IS_JOIN ='1')",
					"(ID IN (SELECT ORG_ID FROM ARTICLE WHERE ARTICLE_TYPE='2' AND ARTICLE_TITLE LIKE ?) AND IS_JOIN ='1')" }) String kw,
			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> query(Connection con, 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;
}

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

@@ -0,0 +1,18 @@
package com.ekexiu.portal.dao;
import java.sql.Connection;
import java.sql.SQLException;
import org.jfw.apt.annotation.Nullable;
import org.jfw.apt.orm.annotation.dao.DAO;
import org.jfw.apt.orm.annotation.dao.method.operator.SelectOne;
import com.ekexiu.portal.po.OrgRegInfo;
@DAO
public interface OrgRegInfoDao {
	@SelectOne
	@Nullable
	OrgRegInfo query(Connection con ,String name)throws SQLException;
}

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

@@ -0,0 +1,36 @@
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.SetSentence;
import org.jfw.apt.orm.annotation.dao.method.Where;
import org.jfw.apt.orm.annotation.dao.method.operator.SelectList;
import org.jfw.apt.orm.annotation.dao.method.operator.UpdateWith;
import org.jfw.apt.orm.annotation.dao.param.Set;
import com.ekexiu.portal.po.PaperAuthor;
@DAO
public interface PaperAuthorDao {
	
	@SelectList
	List<PaperAuthor> query(Connection con,String paperId) throws SQLException;
	
	@UpdateWith
	@From(PaperAuthor.class)
	@SetSentence("ASS_TIME=TO_CHAR(NOW(),'YYYYMMDDHH24MISS')")
	@Where("PROFESSOR_ID='################################'")
	int update(Connection con,String paperId,@Set String professorId,String name)throws SQLException;
	
	@UpdateWith
	@From(PaperAuthor.class)
	@SetSentence("PROFESSOR_ID='################################'")
	int update(Connection con,String paperId,String professorId)throws SQLException;
	
	
	
}

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

@@ -0,0 +1,32 @@
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.SetSentence;
import org.jfw.apt.orm.annotation.dao.method.Where;
import org.jfw.apt.orm.annotation.dao.method.operator.SelectList;
import org.jfw.apt.orm.annotation.dao.method.operator.UpdateWith;
import org.jfw.apt.orm.annotation.dao.param.Set;
import com.ekexiu.portal.po.PatentAuthor;
@DAO
public interface PatentAuthorDao {
	
	@SelectList
	List<PatentAuthor> query(Connection con,String patentId) throws SQLException;
	
	@UpdateWith
	@From(PatentAuthor.class)
	@SetSentence("ASS_TIME=TO_CHAR(NOW(),'YYYYMMDDHH24MISS')")
	@Where("PROFESSOR_ID='################################'")
	int update(Connection con,String patentId,@Set String professorId,String name)throws SQLException;
	
	@UpdateWith
	@From(PatentAuthor.class)
	@SetSentence("PROFESSOR_ID='################################'")
	int update(Connection con,String patentId,String professorId)throws SQLException;
}

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

@@ -0,0 +1,75 @@
package com.ekexiu.portal.dao;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.List;
import org.jfw.apt.annotation.Nullable;
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.Or;
import org.jfw.apt.orm.annotation.dao.method.OrderBy;
import org.jfw.apt.orm.annotation.dao.method.SetSentence;
import org.jfw.apt.orm.annotation.dao.method.operator.PageQuery;
import org.jfw.apt.orm.annotation.dao.method.operator.PageSelect;
import org.jfw.apt.orm.annotation.dao.method.operator.SelectList;
import org.jfw.apt.orm.annotation.dao.method.operator.SelectOne;
import org.jfw.apt.orm.annotation.dao.method.operator.UpdateWith;
import org.jfw.apt.orm.annotation.dao.param.Alias;
import org.jfw.apt.orm.annotation.dao.param.In;
import org.jfw.apt.orm.annotation.dao.param.Like;
import org.jfw.apt.orm.annotation.dao.param.Set;
import org.jfw.apt.orm.annotation.dao.param.SqlColumn;
import org.jfw.apt.orm.core.defaultImpl.FixLenStringHandler;
import org.jfw.util.PageQueryResult;
import com.ekexiu.portal.po.Ppaper;
import com.ekexiu.portal.pojo.AssedPaper;
@DAO
public interface PpaperDao {
	@SelectOne
	@Nullable
	Ppaper query(Connection con, String id) throws SQLException;
	@SelectList
	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;
	@PageQuery
	@OrderBy(" ORDER BY ASS_TIME DESC,ID ASC")
	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,
			@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;
	
	@From(Ppaper.class)
	@UpdateWith
	@SetSentence("PAGE_VIEWS = PAGE_VIEWS + 1")
	 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;
	
	@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;
	
	
	@SelectOne
	@Nullable
	Ppaper query(Connection con,long shareId)throws SQLException;
}

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

@@ -0,0 +1,73 @@
package com.ekexiu.portal.dao;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.List;
import org.jfw.apt.annotation.Nullable;
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.Or;
import org.jfw.apt.orm.annotation.dao.method.OrderBy;
import org.jfw.apt.orm.annotation.dao.method.SetSentence;
import org.jfw.apt.orm.annotation.dao.method.operator.PageQuery;
import org.jfw.apt.orm.annotation.dao.method.operator.PageSelect;
import org.jfw.apt.orm.annotation.dao.method.operator.SelectList;
import org.jfw.apt.orm.annotation.dao.method.operator.SelectOne;
import org.jfw.apt.orm.annotation.dao.method.operator.UpdateWith;
import org.jfw.apt.orm.annotation.dao.param.Alias;
import org.jfw.apt.orm.annotation.dao.param.In;
import org.jfw.apt.orm.annotation.dao.param.Like;
import org.jfw.apt.orm.annotation.dao.param.Set;
import org.jfw.apt.orm.annotation.dao.param.SqlColumn;
import org.jfw.apt.orm.core.defaultImpl.FixLenStringHandler;
import org.jfw.util.PageQueryResult;
import com.ekexiu.portal.po.Ppatent;
import com.ekexiu.portal.pojo.AssedPatent;
@DAO
public interface PpatentDao {
	@SelectOne
	@Nullable
	Ppatent query(Connection con, String id) throws SQLException;
	@SelectList
	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;
	@PageQuery
	@OrderBy(" ORDER BY ASS_TIME DESC,ID ASC")
	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,
			@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;
	
	@From(Ppatent.class)
	@UpdateWith
	@SetSentence("PAGE_VIEWS = PAGE_VIEWS + 1")
	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;
	
	@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;
	@SelectOne
	@Nullable
	Ppatent query(Connection con,long shareId)throws SQLException;
}

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

@@ -69,6 +69,10 @@ public abstract class ProfessorDao {
		}
	}
	
	@SelectOne
	@Nullable
	public abstract Professor query(Connection con,long shareId)throws SQLException;
	
	@UpdateWith
	@From(Professor.class)
	public abstract int updatePhone(Connection con, String id, @Set String phone) throws SQLException;
@@ -172,7 +176,7 @@ public abstract class ProfessorDao {
	
	public List<EditProfessor> queryInvite(Connection con, String id) throws SQLException{
		int index = 1;
        String sql = "SELECT OFFICE,ADDRESS,ORG_ID,O.NAME,TITLE,AUTHENTICATION,P.AUTH_TYPE,P.AUTH_STATUS,P.ID,P.NAME,ORG_AUTH "
        String sql = "SELECT OFFICE,ADDRESS,ORG_ID,O.NAME,TITLE,AUTHENTICATION,P.AUTH_TYPE,P.AUTH_STATUS,P.ID,P.NAME,ORG_AUTH,P.SHARE_ID "
        		+ " FROM PROFESSOR P LEFT JOIN ORGANIZATION O ON P.ORG_ID=O.ID "
        		+ " INNER JOIN LUSER L ON P.ID=L.ID WHERE L.INVITER_ID = ? ORDER BY P.CREATE_TIME DESC,P.ID";
        PreparedStatement ps = con.prepareStatement(sql);
@@ -216,6 +220,7 @@ public abstract class ProfessorDao {
                    professor.setId(rs.getString(9));
                    professor.setName(rs.getString(10));
                    professor.setOrgAuth(rs.getString(11));
                    professor.setShareId(rs.getLong(12));
                    professors.add(professor);
                }
                return professors;
@@ -275,7 +280,7 @@ public abstract class ProfessorDao {
	public EditProfessor queryBaseInfo(Connection con, String id) throws SQLException {
		int index = 1;
        String sql = "SELECT P.OFFICE,P.DEPARTMENT,P.TITLE,AUTHENTICATION,AUTH_TYPE,P.AUTH_STATUS,"
        		+ " P.ID,P.NAME,P.ADDRESS,P.ORG_AUTH,ORGANIZATION.NAME,P.ORG_ID,P.SCORE_PERCENT "
        		+ " P.ID,P.NAME,P.ADDRESS,P.ORG_AUTH,ORGANIZATION.NAME,P.ORG_ID,P.SCORE_PERCENT,P.SHARE_ID,P.PHONE,P.EMAIL,P.PROVINCE"
        		+ " FROM PROFESSOR P LEFT JOIN ORGANIZATION ON P.ORG_ID = ORGANIZATION.ID WHERE P.ID = ?";
        PreparedStatement ps = con.prepareStatement(sql);
        try{
@@ -329,6 +334,23 @@ public abstract class ProfessorDao {
                    	scorePercent = null;
                    }
                    professor.setScorePercent(scorePercent);
                    professor.setShareId(rs.getLong(14));
                    String phone = rs.getString(15);
                    if(rs.wasNull()){
                    	phone = null;
                    }
                    professor.setPhone(phone);
                    String email = rs.getString(16);
                    if(rs.wasNull()){
                    	email = null;
                    }
                    professor.setEmail(email);
                    String province = rs.getString(17);
                    if(rs.wasNull()){
                    	province = null;
                    }
                    professor.setProvince(province);
                    
                    return professor;
                }else{
                    return null;
@@ -343,7 +365,7 @@ public abstract class ProfessorDao {
	
	public List<EditProfessor> queryByName(Connection con,String name,int total) throws SQLException{
        int index = 1;
        String sql = "SELECT P.OFFICE,P.DEPARTMENT,P.TITLE,AUTHENTICATION,AUTH_TYPE,P.AUTH_STATUS,P.ID,P.NAME,P.ADDRESS,P.ORG_AUTH,ORGANIZATION.NAME,P.ORG_ID,P.SCORE_PERCENT "
        String sql = "SELECT P.OFFICE,P.DEPARTMENT,P.TITLE,AUTHENTICATION,AUTH_TYPE,P.AUTH_STATUS,P.ID,P.NAME,P.ADDRESS,P.ORG_AUTH,ORGANIZATION.NAME,P.ORG_ID,P.SCORE_PERCENT,P.SHARE_ID "
        		+ " FROM PROFESSOR P LEFT JOIN ORGANIZATION ON P.ORG_ID = ORGANIZATION.ID WHERE P.NAME LIKE ? ORDER BY P.SCORE_PERCENT DESC LIMIT " + total;
        PreparedStatement ps = con.prepareStatement(sql);
        try{
@@ -398,6 +420,7 @@ public abstract class ProfessorDao {
                    	scorePercent = null;
                    }
                    professor.setScorePercent(scorePercent);
                    professor.setShareId(rs.getLong(14));
                    editProfessors.add(professor);
                }
                return editProfessors;
@@ -419,7 +442,7 @@ public abstract class ProfessorDao {
	public EditProfessor queryEditBaseInfo(Connection con, String id) throws SQLException {
		int index = 1;
        String sql = "SELECT P.OFFICE,P.DEPARTMENT,P.TITLE,AUTHENTICATION,AUTH_TYPE,P.AUTH_STATUS,"
        		+ " P.ID,P.NAME,P.ADDRESS,P.STAR_LEVEL,P.CONSULT_COUNT,P.ORG_AUTH,ORGANIZATION.NAME "
        		+ " P.ID,P.NAME,P.ADDRESS,P.STAR_LEVEL,P.CONSULT_COUNT,P.ORG_AUTH,ORGANIZATION.NAME,P.SHARE_ID "
        		+ " FROM PROFESSOR P LEFT JOIN ORGANIZATION ON P.ORG_ID = ORGANIZATION.ID WHERE P.ID = ?";
        PreparedStatement ps = con.prepareStatement(sql);
        try{
@@ -465,6 +488,7 @@ public abstract class ProfessorDao {
                    	orgName = null;
                    }
                    professor.setOrgName(orgName);
                    professor.setShareId(rs.getLong(14));
                    return professor;
                }else{
                    return null;
@@ -484,7 +508,7 @@ public abstract class ProfessorDao {
	public Professor query(Connection con, String id) throws SQLException{
        int index = 1;
        String sql = "SELECT P.OFFICE,P.SUBJECT,P.INDUSTRY,P.ADDRESS,P.DEPARTMENT,ORG_ID,P.TITLE,AUTHENTICATION,AUTH_TYPE,"
        		+ "P.AUTH_STATUS,P.ID,P.NAME,P.DESCP,P.CREATE_TIME,P.MODIFY_TIME,P.PHONE,P.EMAIL,P.ORG_AUTH,ORGANIZATION.NAME "
        		+ "P.AUTH_STATUS,P.ID,P.NAME,P.DESCP,P.CREATE_TIME,P.MODIFY_TIME,P.PHONE,P.EMAIL,P.ORG_AUTH,ORGANIZATION.NAME,P.SHARE_ID "
        		+ "FROM PROFESSOR P LEFT JOIN ORGANIZATION ON P.ORG_ID = ORGANIZATION.ID WHERE P.ID = ?";
        PreparedStatement ps = con.prepareStatement(sql);
        try{
@@ -562,6 +586,7 @@ public abstract class ProfessorDao {
                    }
                    organization.setName(orgName);
                    professor.setOrganization(organization);
                    professor.setShareId(rs.getLong(20));
                    return professor;
                }else{
                    return null;
@@ -576,7 +601,7 @@ public abstract class ProfessorDao {
	public List<Professor> query(Connection con) throws SQLException{
        String sql = "SELECT OFFICE,P.SUBJECT,P.INDUSTRY,P.PROVINCE,P.ADDRESS,DEPARTMENT,ORG_ID,organization.NAME AS ONAME,"
        		+ " TITLE,AUTHENTICATION,AUTH_TYPE,P.AUTH_STATUS,P.ID,P.NAME AS PNAME,P.DESCP,P.CREATE_TIME,P.MODIFY_TIME,P.ORG_AUTH "
        		+ " TITLE,AUTHENTICATION,AUTH_TYPE,P.AUTH_STATUS,P.ID,P.NAME AS PNAME,P.DESCP,P.CREATE_TIME,P.MODIFY_TIME,P.ORG_AUTH,P.SHARE_ID "
        		+ " FROM PROFESSOR P LEFT JOIN ORGANIZATION ON P.ORG_ID=organization.ID ORDER BY ONAME,P.ID";
        PreparedStatement ps = con.prepareStatement(sql);
        try{
@@ -641,6 +666,7 @@ public abstract class ProfessorDao {
                    professor.setCreateTime(rs.getString(16));
                    professor.setModifyTime(rs.getString(17));
                    professor.setOrgAuth(rs.getString(18));
                    professor.setShareId(rs.getLong(19));
                    professors.add(professor);
                }
                return professors;
@@ -692,7 +718,7 @@ public abstract class ProfessorDao {
        boolean firstPage = (1 == pageNo);
        if(firstPage){
            queryResult.setPageNo(1);
            sql = "SELECT OFFICE,DEPARTMENT,TITLE,AUTHENTICATION,AUTH_TYPE,AUTH_STATUS,ID,NAME,ADDRESS,ORG_AUTH FROM PROFESSOR";
            sql = "SELECT OFFICE,DEPARTMENT,TITLE,AUTHENTICATION,AUTH_TYPE,AUTH_STATUS,ID,NAME,ADDRESS,ORG_AUTH,SHARE_ID FROM PROFESSOR";
            sql = sql + whereSql;
            sql = sql + " ORDER BY AUTH_TYPE DESC,ID";
            sql = sql + " LIMIT " + pageSize;
@@ -756,6 +782,7 @@ public abstract class ProfessorDao {
                	}
                    professor.setAddress(address);
                    professor.setOrgAuth(rs.getString(10));
                    professor.setShareId(rs.getLong(11));
                    professors.add(professor);
                }
                return queryResult;
@@ -771,7 +798,7 @@ public abstract class ProfessorDao {
        int index = 1;
        boolean hasOrgAuth = null != orgAuth;
        StringBuilder sql = new StringBuilder();
        sql.append("SELECT OFFICE,DEPARTMENT,TITLE,AUTHENTICATION,AUTH_TYPE,AUTH_STATUS,ID,NAME,ADDRESS,ORG_AUTH FROM PROFESSOR");
        sql.append("SELECT OFFICE,DEPARTMENT,TITLE,AUTHENTICATION,AUTH_TYPE,AUTH_STATUS,ID,NAME,ADDRESS,ORG_AUTH,SHARE_ID FROM PROFESSOR");
        sql.append(" WHERE ORG_ID = ?");
        if(hasOrgAuth){
            sql.append(" AND ORG_AUTH = ?");
@@ -818,6 +845,7 @@ public abstract class ProfessorDao {
                	}
                    professor.setAddress(address);
                    professor.setOrgAuth(rs.getString(10));
                    professor.setShareId(rs.getLong(11));
                    professors.add(professor);
                }
                return professors;
@@ -965,7 +993,7 @@ public abstract class ProfessorDao {
		if (1 == pageNo) {
			queryResult.setPageNo(1);
			sql = new StringBuilder();
			sql.append("SELECT OFFICE,P.ADDRESS,TITLE,AUTHENTICATION,AUTH_TYPE,P.AUTH_STATUS,P.ID,P.NAME,ORG_ID,P.ORG_AUTH,ORGANIZATION.NAME"
			sql.append("SELECT OFFICE,P.ADDRESS,TITLE,AUTHENTICATION,AUTH_TYPE,P.AUTH_STATUS,P.ID,P.NAME,ORG_ID,P.ORG_AUTH,ORGANIZATION.NAME,P.SHARE_ID"
	        		+ " FROM PROFESSOR P LEFT JOIN ORGANIZATION ON P.ORG_ID=ORGANIZATION.ID ");
			if (whereSql.length() > 0) {
				sql.append(whereSql);
@@ -984,7 +1012,7 @@ public abstract class ProfessorDao {
			--pageNo;
			int offset = (pageNo * pageSize);
			sql = new StringBuilder();
			sql.append("SELECT OFFICE,P.ADDRESS,TITLE,AUTHENTICATION,AUTH_TYPE,P.AUTH_STATUS,P.ID,P.NAME,ORG_ID,P.ORG_AUTH,ORGANIZATION.NAME"
			sql.append("SELECT OFFICE,P.ADDRESS,TITLE,AUTHENTICATION,AUTH_TYPE,P.AUTH_STATUS,P.ID,P.NAME,ORG_ID,P.ORG_AUTH,ORGANIZATION.NAME,P.SHARE_ID"
	        		+ " FROM PROFESSOR P LEFT JOIN ORGANIZATION ON P.ORG_ID=ORGANIZATION.ID ");
			if (whereSql.length() > 0) {
				sql.append(whereSql);
@@ -1031,6 +1059,7 @@ public abstract class ProfessorDao {
                    	orgName = null;
                    }
                    professor.setOrgName(orgName);
                    professor.setShareId(rs.getLong(12));
                    professors.add(professor);
				}
				return queryResult;
@@ -1160,7 +1189,7 @@ public abstract class ProfessorDao {
		if (1 == pageNo) {
			queryResult.setPageNo(1);
			sql = new StringBuilder();
			sql.append("SELECT OFFICE,P.ADDRESS,TITLE,AUTHENTICATION,AUTH_TYPE,P.AUTH_STATUS,P.ID,P.NAME,ORG_ID,P.ORG_AUTH,ORGANIZATION.NAME"
			sql.append("SELECT OFFICE,P.ADDRESS,TITLE,AUTHENTICATION,AUTH_TYPE,P.AUTH_STATUS,P.ID,P.NAME,ORG_ID,P.ORG_AUTH,ORGANIZATION.NAME,P.SHARE_ID"
	        		+ " FROM PROFESSOR P LEFT JOIN ORGANIZATION ON P.ORG_ID=ORGANIZATION.ID ");
			if (whereSql.length() > 0) {
				sql.append(whereSql);
@@ -1179,7 +1208,7 @@ public abstract class ProfessorDao {
			--pageNo;
			int offset = (pageNo * pageSize);
			sql = new StringBuilder();
			sql.append("SELECT OFFICE,P.ADDRESS,TITLE,AUTHENTICATION,AUTH_TYPE,P.AUTH_STATUS,P.ID,P.NAME,ORG_ID,P.ORG_AUTH,ORGANIZATION.NAME"
			sql.append("SELECT OFFICE,P.ADDRESS,TITLE,AUTHENTICATION,AUTH_TYPE,P.AUTH_STATUS,P.ID,P.NAME,ORG_ID,P.ORG_AUTH,ORGANIZATION.NAME,P.SHARE_ID"
	        		+ " FROM PROFESSOR P LEFT JOIN ORGANIZATION ON P.ORG_ID=ORGANIZATION.ID ");
			if (whereSql.length() > 0) {
				sql.append(whereSql);
@@ -1254,6 +1283,7 @@ public abstract class ProfessorDao {
                    	orgName = null;
                    }
                    professor.setOrgName(orgName);
                    professor.setShareId(rs.getLong(12));
                    professors.add(professor);
				}
				return queryResult;
@@ -1375,7 +1405,7 @@ public abstract class ProfessorDao {
			queryResult.setPageNo(1);
			sql = new StringBuilder();
			sql.append("SELECT OFFICE,P.SUBJECT,P.INDUSTRY,P.ADDRESS,DEPARTMENT,ORGANIZATION.NAME,TITLE,"
					+ " AUTHENTICATION,AUTH_TYPE,P.AUTH_STATUS,P.ID,P.NAME,STAR_LEVEL,CONSULT_COUNT,P.ORG_AUTH "
					+ " AUTHENTICATION,AUTH_TYPE,P.AUTH_STATUS,P.ID,P.NAME,STAR_LEVEL,CONSULT_COUNT,P.ORG_AUTH,P.SHARE_ID "
					+ " FROM PROFESSOR P LEFT JOIN ORGANIZATION ON ORG_ID=ORGANIZATION.ID ");
			if (whereSql.length() > 0) {
				sql.append(whereSql);
@@ -1395,7 +1425,7 @@ public abstract class ProfessorDao {
			int offset = (pageNo * pageSize);
			sql = new StringBuilder();
			sql.append("SELECT OFFICE,P.SUBJECT,P.INDUSTRY,P.ADDRESS,DEPARTMENT,ORGANIZATION.NAME,TITLE,"
					+ " AUTHENTICATION,AUTH_TYPE,P.AUTH_STATUS,P.ID,P.NAME,STAR_LEVEL,CONSULT_COUNT,P.ORG_AUTH "
					+ " AUTHENTICATION,AUTH_TYPE,P.AUTH_STATUS,P.ID,P.NAME,STAR_LEVEL,CONSULT_COUNT,P.ORG_AUTH,P.SHARE_ID "
					+ " FROM PROFESSOR P LEFT JOIN ORGANIZATION ON ORG_ID=ORGANIZATION.ID ");
			if (whereSql.length() > 0) {
				sql.append(whereSql);
@@ -1482,6 +1512,7 @@ public abstract class ProfessorDao {
					professor.setStarLevel(rs.getBigDecimal(13));
					professor.setConsultCount(rs.getInt(14));
					professor.setOrgAuth(rs.getString(15));
					professor.setShareId(rs.getLong(16));
					professors.add(professor);
				}
				return queryResult;
@@ -1579,7 +1610,7 @@ public abstract class ProfessorDao {
			queryResult.setPageNo(1);
			sql = new StringBuilder();
			sql.append("SELECT OFFICE,P.SUBJECT,P.INDUSTRY,P.ADDRESS,DEPARTMENT,ORG_ID,organization.NAME,"
					+ " TITLE,AUTHENTICATION,P.ID,P.NAME,P.DESCP,P.CREATE_TIME,P.MODIFY_TIME,P.ORG_AUTH "
					+ " TITLE,AUTHENTICATION,P.ID,P.NAME,P.DESCP,P.CREATE_TIME,P.MODIFY_TIME,P.ORG_AUTH,P.SHARE_ID "
					+ " FROM PROFESSOR P LEFT JOIN ORGANIZATION ON P.ORG_ID=organization.ID ");
			if (whereSql.length() > 0) {
				sql.append(whereSql);
@@ -1599,7 +1630,7 @@ public abstract class ProfessorDao {
			int offset = (pageNo * pageSize);
			sql = new StringBuilder();
			sql.append("SELECT OFFICE,P.SUBJECT,P.INDUSTRY,P.ADDRESS,DEPARTMENT,ORG_ID,organization.NAME,"
					+ " TITLE,AUTHENTICATION,P.ID,P.NAME,P.DESCP,P.CREATE_TIME,P.MODIFY_TIME,P.ORG_AUTH "
					+ " TITLE,AUTHENTICATION,P.ID,P.NAME,P.DESCP,P.CREATE_TIME,P.MODIFY_TIME,P.ORG_AUTH,P.SHARE_ID "
					+ " FROM PROFESSOR P LEFT JOIN ORGANIZATION ON P.ORG_ID=organization.ID ");
			if (whereSql.length() > 0) {
				sql.append(whereSql);
@@ -1689,6 +1720,7 @@ public abstract class ProfessorDao {
					professor.setCreateTime(rs.getString(13));
					professor.setModifyTime(rs.getString(14));
					professor.setOrgAuth(rs.getString(15));
					professor.setShareId(rs.getLong(16));
					professors.add(professor);
				}
				return queryResult;
@@ -1793,7 +1825,7 @@ public abstract class ProfessorDao {
			queryResult.setPageNo(1);
			sql = new StringBuilder();
			sql.append("SELECT OFFICE,P.SUBJECT,P.INDUSTRY,P.ADDRESS,DEPARTMENT,O.NAME,TITLE,AUTHENTICATION,"
					+ " P.AUTH_TYPE,P.AUTH_STATUS,P.ID,P.NAME,P.EMAIL,P.PHONE,L.ACTIVE_TIME,P.ORG_AUTH "
					+ " P.AUTH_TYPE,P.AUTH_STATUS,P.ID,P.NAME,P.EMAIL,P.PHONE,L.ACTIVE_TIME,P.ORG_AUTH,P.SHARE_ID "
					+ " FROM PROFESSOR P LEFT JOIN ORGANIZATION O ON P.ORG_ID=O.ID LEFT JOIN LUSER L ON P.ID=L.ID");
			if (whereSql.length() > 0) {
				sql.append(whereSql);
@@ -1813,7 +1845,7 @@ public abstract class ProfessorDao {
			int offset = (pageNo * pageSize);
			sql = new StringBuilder();
			sql.append("SELECT OFFICE,P.SUBJECT,P.INDUSTRY,P.ADDRESS,DEPARTMENT,O.NAME,TITLE,AUTHENTICATION,"
					+ " P.AUTH_TYPE,P.AUTH_STATUS,P.ID,P.NAME,P.EMAIL,P.PHONE,L.ACTIVE_TIME,P.ORG_AUTH "
					+ " P.AUTH_TYPE,P.AUTH_STATUS,P.ID,P.NAME,P.EMAIL,P.PHONE,L.ACTIVE_TIME,P.ORG_AUTH,P.SHARE_ID "
					+ " FROM PROFESSOR P LEFT JOIN ORGANIZATION O ON P.ORG_ID=O.ID LEFT JOIN LUSER L ON P.ID=L.ID");
			if (whereSql.length() > 0) {
				sql.append(whereSql);
@@ -1897,6 +1929,7 @@ public abstract class ProfessorDao {
					userInfo.setActiveTime(rs.getString(15));
					userInfo.setActiveState(!(rs.getString(15)==null));
					userInfo.setOrgAuth(rs.getString(16));
					userInfo.setShareId(rs.getLong(17));
					userInfos.add(userInfo);
				}
				return queryResult;

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

@@ -19,6 +19,7 @@ import org.jfw.apt.orm.annotation.dao.method.Where;
import org.jfw.apt.orm.annotation.dao.method.operator.DeleteWith;
import org.jfw.apt.orm.annotation.dao.method.operator.Insert;
import org.jfw.apt.orm.annotation.dao.method.operator.LimitSelect;
import org.jfw.apt.orm.annotation.dao.method.operator.PageSelect;
import org.jfw.apt.orm.annotation.dao.method.operator.SelectList;
import org.jfw.apt.orm.annotation.dao.method.operator.SelectOne;
import org.jfw.apt.orm.annotation.dao.method.operator.Update;
@@ -1079,6 +1080,12 @@ public abstract class ResourceDao {
	@Where("STATUS = '1'")
	public abstract List<Resource> queryProPublish(Connection con,String professorId) throws SQLException;
	
	
	@PageSelect
	@OrderBy("ORDER BY PUBLISH_TIME DESC")
	@Where("STATUS = '1'")
	public abstract PageQueryResult<Resource> pageQueryProPublish(Connection con,String professorId,int pageSize,int pageNo) throws SQLException;
	
	@SelectList
	@OrderBy("ORDER BY PUBLISH_TIME DESC")
	@Where("STATUS IN ('0','1')")
@@ -1089,6 +1096,11 @@ public abstract class ResourceDao {
	@Where("STATUS = '1'")
	public abstract List<Resource> queryOrgPublish(Connection con,String orgId) throws SQLException;
	
	@PageSelect
	@OrderBy("ORDER BY PUBLISH_TIME DESC")
	@Where("STATUS = '1'")
	public abstract PageQueryResult<Resource> pageQueryOrgPublish(Connection con,String orgId,int pageSize,int pageNo) throws SQLException;
	
	/**
	 * 按专家ID查询发布的所有资源
	 * @param con
@@ -1763,4 +1775,7 @@ public abstract class ResourceDao {
        }
    }
	
	@SelectOne
	@Nullable
	public abstract Resource query(Connection con,long shareId)throws SQLException;
}

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

@@ -4,15 +4,19 @@ import java.sql.Connection;
import java.sql.SQLException;
import java.util.List;
import org.jfw.apt.annotation.DefaultValue;
import org.jfw.apt.annotation.Nullable;
import org.jfw.apt.orm.annotation.dao.Column;
import org.jfw.apt.orm.annotation.dao.DAO;
import org.jfw.apt.orm.annotation.dao.method.From;
import org.jfw.apt.orm.annotation.dao.method.OrderBy;
import org.jfw.apt.orm.annotation.dao.method.operator.DeleteWith;
import org.jfw.apt.orm.annotation.dao.method.operator.Insert;
import org.jfw.apt.orm.annotation.dao.method.operator.PageSelect;
import org.jfw.apt.orm.annotation.dao.method.operator.QueryVal;
import org.jfw.apt.orm.annotation.dao.method.operator.SelectList;
import org.jfw.apt.orm.annotation.dao.method.operator.SelectOne;
import org.jfw.apt.orm.core.defaultImpl.IntHandler;
import org.jfw.util.PageQueryResult;
import com.ekexiu.portal.po.Watch;
@@ -21,30 +25,41 @@ import com.ekexiu.portal.po.Watch;
public abstract class WatchDao {
	@Insert
	public abstract int insert(Connection con, Watch watch) throws SQLException;
	
	@DeleteWith
	@From(Watch.class)
	public abstract int delete(Connection con, String professorId, String watchObject) throws SQLException;
	
	@DeleteWith
	@From(Watch.class)
	public abstract int deletePro(Connection con, String professorId) throws SQLException;
	
	@DeleteWith
	@From(Watch.class)
	public abstract int deleteWatch(Connection con, String watchObject) throws SQLException;
	
	@Nullable
	@SelectOne
	public abstract Watch queryOne(Connection con, String professorId, String watchObject) throws SQLException;
	
	@PageSelect
	@OrderBy(" ORDER BY CREATE_TIME DESC ")
	public abstract PageQueryResult<Watch> queryPro(Connection con, String professorId, 
			Integer watchType, int pageSize, int pageNo) throws SQLException;
	
	public abstract PageQueryResult<Watch> queryPro(Connection con, String professorId, short watchType, int pageSize, int pageNo) throws SQLException;
	@SelectList
	@OrderBy(" ORDER BY CREATE_TIME DESC ")
	public abstract List<Watch> queryWatch(Connection con, String watchObject) throws SQLException;
	
	@QueryVal
	@From(Watch.class)
	@Column(value = "COUNT(1)", handlerClass = IntHandler.class)
	@DefaultValue("0")
	public abstract int countWatchObject(Connection con, String professorId, short watchType) throws SQLException;
	@QueryVal
	@From(Watch.class)
	@Column(value = "COUNT(1)", handlerClass = IntHandler.class)
	@DefaultValue("0")
	public abstract int countProfessor(Connection con, String watchObject, short watchType) throws SQLException;
}

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

@@ -13,6 +13,7 @@ import org.jfw.util.bean.BeanFactory;
import org.jfw.util.context.JfwAppContext;
import com.ekexiu.portal.service.WeixinService;
import com.ekexiu.push.service.PushService;
@Bean
public class TaskJob implements AfterBeanFactory {
@@ -28,6 +29,7 @@ public class TaskJob implements AfterBeanFactory {
		DictTaskJobEntry dtje = (DictTaskJobEntry) bf.getBean("com_ekexiu_portal_job_DictTaskJobEntry");
		HotKeyJobEntry hkje = (HotKeyJobEntry) bf.getBean("com_ekexiu_portal_job_HotKeyJobEntry");
		final WeixinService weixin =(WeixinService)bf.getBean("com_ekexiu_portal_service_WeixinService");
		final PushService pushService =(PushService)bf.getBean("com_ekexiu_push_service_PushService");
		
		long delayTime = tje.getDelayTime();
		long task = getTimeMillis(tje.getTaskTime());
@@ -50,12 +52,22 @@ public class TaskJob implements AfterBeanFactory {
		long hkjeTaskTime = hkjeTask - System.currentTimeMillis();
		hkjeTaskTime = hkjeTaskTime > 0 ? hkjeTaskTime : hkjeTaskTime + hkje.getDelayTime();
		service.scheduleAtFixedRate(hkje, hkjeTaskTime, hkje.getDelayTime(), TimeUnit.MILLISECONDS);
		if(hkjeTaskTime>300*1000){
			service.submit(hkje);
		}
		
		service.scheduleAtFixedRate(new Runnable() {
			@Override
			public void run() {
				weixin.refresh();
			}
		}, 0, weixin.getDelayTime(), TimeUnit.SECONDS);
		service.scheduleAtFixedRate(new Runnable() {
			@Override
			public void run() {
				pushService.refresh();				
			}
		}, 0, 2,TimeUnit.SECONDS);
	}
	private static long getTimeMillis(String time) {  
	    try {  

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

@@ -30,6 +30,7 @@ public class Article implements CreateTimeSupported, ModifyTimeSupported {
	private int articleAgree;
	private int pageViews;
	private String status;
	private long shareId;
	private EditProfessor professor;
	private Organization organization;
	private EditOrganization editOrganization;
@@ -155,5 +156,13 @@ public class Article implements CreateTimeSupported, ModifyTimeSupported {
	public void setStatus(String status) {
		this.status = status;
	}
	@Column(DE.bigSerial)
	public long getShareId() {
		return shareId;
	}
	public void setShareId(long shareId) {
		this.shareId = shareId;
	}
	
}

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

@@ -0,0 +1,92 @@
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("id")
@Table
public class Feedback implements CreateTimeSupported{
	private long id;
	private String title;
	private int category;// int4 NOT NULL,
	private int schema;// int4 NOT NULL,
	private String param;// text NOT NULL,
	private String content;// text NOT NULL,
	private String createTime;// char(14) NOT NULL,
	private String  state;// char(1) NOT NULL,
	private String userId;
	
	@Override
	public String getCreateTime() {
		return this.createTime;
	}
	@Override
	public void setCreateTime(String createTime) {
		this.createTime = createTime;
	}
	
	@Column(DE.bigSerial)
	public long getId() {
		return id;
	}
	public void setId(long id) {
		this.id = id;
	}
	@Column(DE.Text_de)
	public String getTitle() {
		return title;
	}
	public void setTitle(String title) {
		this.title = title;
	}
	@Column(DE.int_de)
	public int getCategory() {
		return category;
	}
	public void setCategory(int category) {
		this.category = category;
	}
	@Column(DE.int_de)
	public int getSchema() {
		return schema;
	}
	public void setSchema(int schema) {
		this.schema = schema;
	}
	@Column(DE.text_de)
	public String getParam() {
		return param;
	}
	public void setParam(String param) {
		this.param = param;
	}
	@Column(DE.text_de)
	public String getContent() {
		return content;
	}
	
	public void setContent(String content) {
		this.content = content;
	}
	@Column(DE.singleChar)
	public String getState() {
		return state;
	}
	public void setState(String state) {
		this.state = state;
	}
	@Column(DE.Text_de)
	public String getUserId() {
		return userId;
	}
	public void setUserId(String userId) {
		this.userId = userId;
	}
	
	
	
}

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

@@ -0,0 +1,114 @@
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;
@PrimaryKey("code")
@Table
public class OrgRegInfo {
	
	private String name;
//	 工商注册号：330108000016033
	private String num;
//	组织机构代码：673959654 
	private String code;
//	统一信用代码：91330106673959654P 
	private String  creditCode;
//	企业类型：私营有限责任公司(自然人控股或私营性质企业控股) 
	private String type;
//	行业：软件和信息技术服务业 
	private  String industry;
//	营业期限：2008-04-08至2038-04-07 
	private String operatingPeriod;
//	核准日期：2017-05-05 
	private String dayOfApproval;
//	登记机关：杭州市西湖区市场监督管理局 
	private String manager;
//	注册地址：浙江省杭州市西湖区转塘科技经济区块16号8幢 
	private String addr;
//	经营范围： 第一类增值电信业务中的因特网数据中心业务；第二类增值电信业务中的因特网接入服务业务；第二类增值电信业务中的信息服务业务（不含固定网电话信息服务），利用自有网站发布国内网络广告（涉及前置审批项目的，在有效期内方可经营）。服务：计算机软硬件、电子产品、数码产品的技术开发、技术服务，设计、制作、代理国内广告，成年人的非文化教育培训、成年人的非证书劳动职业技能培训（涉及前置审批的项目除外）；批发、零售：计算机软硬件，电子产品（除专控），数码产品；会务服务，承办展览，展览展示设计。
	private String scopeOfBusiness;
	
	@Column(DE.text_de)
	public String getName() {
		return name;
	}
	public void setName(String name) {
		this.name = name;
	}
	@Column(DE.text_de)
	public String getNum() {
		return num;
	}
	public void setNum(String num) {
		this.num = num;
	}
	@Column(DE.text_de)
	public String getCode() {
		return code;
	}
	public void setCode(String code) {
		this.code = code;
	}
	@Column(DE.Text_de)
	public String getCreditCode() {
		return creditCode;
	}
	public void setCreditCode(String creditCode) {
		this.creditCode = creditCode;
	}
	@Column(DE.text_de)
	public String getType() {
		return type;
	}
	public void setType(String type) {
		this.type = type;
	}
	@Column(DE.text_de)
	public String getIndustry() {
		return industry;
	}
	public void setIndustry(String industry) {
		this.industry = industry;
	}
	@Column(DE.text_de)
	public String getOperatingPeriod() {
		return operatingPeriod;
	}
	public void setOperatingPeriod(String operatingPeriod) {
		this.operatingPeriod = operatingPeriod;
	}
	@Column(DE.text_de)
	public String getDayOfApproval() {
		return dayOfApproval;
	}
	public void setDayOfApproval(String dayOfApproval) {
		this.dayOfApproval = dayOfApproval;
	}
	@Column(DE.text_de)
	public String getManager() {
		return manager;
	}
	
	public void setManager(String manager) {
		this.manager = manager;
	}
	@Column(DE.text_de)
	public String getAddr() {
		return addr;
	}
	public void setAddr(String addr) {
		this.addr = addr;
	}
	@Column(DE.text_de)
	public String getScopeOfBusiness() {
		return scopeOfBusiness;
	}
	public void setScopeOfBusiness(String scopeOfBusiness) {
		this.scopeOfBusiness = scopeOfBusiness;
	}
	
	
}

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

@@ -6,6 +6,7 @@ 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.defaultImpl.FixLenStringHandler;
import org.jfw.apt.orm.core.defaultImpl.LongHandler;
import org.jfw.apt.orm.core.defaultImpl.StringHandler;
import org.jfw.apt.orm.core.enums.DE;
@@ -54,6 +55,37 @@ public class Organization extends BaseOrganization implements CreateTimeSupporte
	private String descp;
	private String createTime;
	private String modifyTime;
	
	/**
	 * 详细地址
	 */
	private String addr;
	/**
	 * 联系邮箱
	 */
	private String email;
	/**
	 * 联系电话
	 */
	private String contactNum;
	/**
	 * 客户领域
	 */
	private String fieldOfCustomer;
	/**
	 * 供应商领域
	 */
	private String fieldOfSupplier;
	/**
	 * 排序字段
	 */
	private long sortNum;
	/**
	 * 浏览量
	 */
	private long pageViews;
	private long shareId;
	
	@Column(value=DE.String_de,dbType="VARCHAR(20)")
	public String getForShort() {
@@ -150,4 +182,63 @@ public class Organization extends BaseOrganization implements CreateTimeSupporte
	public void setModifyTime(String modifyTime) {
		this.modifyTime = modifyTime;
	}
	@Column(DE.Text_de)
	public String getAddr() {
		return addr;
	}
	public void setAddr(String addr) {
		this.addr = addr;
	}
	@Column(DE.Text_de)
	public String getEmail() {
		return email;
	}
	public void setEmail(String email) {
		this.email = email;
	}
	@Column(DE.Text_de)
	public String getContactNum() {
		return contactNum;
	}
	public void setContactNum(String contactNum) {
		this.contactNum = contactNum;
	}
	@Column(DE.Text_de)
	public String getFieldOfCustomer() {
		return fieldOfCustomer;
	}
	public void setFieldOfCustomer(String fieldOfCustomer) {
		this.fieldOfCustomer = fieldOfCustomer;
	}
	@Column(DE.Text_de)
	public String getFieldOfSupplier() {
		return fieldOfSupplier;
	}
	public void setFieldOfSupplier(String fieldOfSupplier) {
		this.fieldOfSupplier = fieldOfSupplier;
	}
	@Column(handlerClass=LongHandler.class,dbType="BIGINT",fixSqlValueWithInsert="0",insertable=true,renewable=false,nullable=false,queryable=true)
	public long getSortNum() {
		return sortNum;
	}
	public void setSortNum(long sortNum) {
		this.sortNum = sortNum;
	}
	@Column(handlerClass=LongHandler.class,dbType="BIGINT",fixSqlValueWithInsert="0",insertable=true,renewable=false,nullable=false,queryable=true)
	public long getPageViews() {
		return pageViews;
	}
	public void setPageViews(long pageViews) {
		this.pageViews = pageViews;
	}
	@Column(DE.bigSerial)
	public long getShareId() {
		return shareId;
	}
	public void setShareId(long shareId) {
		this.shareId = shareId;
	}
	
	
	
}

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

@@ -0,0 +1,47 @@
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;
@PrimaryKey({"paperId","name"})
@Table
public class PaperAuthor {
	private String paperId;
	private String name;
	private String professorId;
	private String assTime;
	
	@Column(DE.id_32)
	public String getPaperId() {
		return paperId;
	}
	public void setPaperId(String paperId) {
		this.paperId = paperId;
	}
	@Column(DE.text_de)
	public String getName() {
		return name;
	}
	public void setName(String name) {
		this.name = name;
	}
	@Column(DE.id_32)
	public String getProfessorId() {
		return professorId;
	}
	public void setProfessorId(String professorId) {
		this.professorId = professorId;
	}
	@Column(DE.dateTime_de)
	public String getAssTime() {
		return assTime;
	}
	public void setAssTime(String assTime) {
		this.assTime = assTime;
	}
	
	
}

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

@@ -0,0 +1,44 @@
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;
@PrimaryKey({"patentId","name"})
@Table
public class PatentAuthor {
	private String patentId;
	private String name;
	private String professorId;
	private String assTime;
	
	@Column(DE.id_32)
	public String getPatentId() {
		return patentId;
	}
	public void setPatentId(String patentId) {
		this.patentId = patentId;
	}
	@Column(DE.text_de)
	public String getName() {
		return name;
	}
	public void setName(String name) {
		this.name = name;
	}
	@Column(DE.id_32)
	public String getProfessorId() {
		return professorId;
	}
	public void setProfessorId(String professorId) {
		this.professorId = professorId;
	}
	@Column(DE.dateTime_de)
	public String getAssTime() {
		return assTime;
	}
	public void setAssTime(String assTime) {
		this.assTime = assTime;
	}
}

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

@@ -0,0 +1,130 @@
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("id")
@Table
public class Ppaper implements CreateTimeSupported {
	private String id; // char(32)  NOT NULL,
	private String name; // text COLLATE "zh_CN.utf8" NOT NULL,
	private long pageViews;// int8 DEFAULT 0 NOT NULL,
	private String cn4periodical;// text,
	private String en4periodical;// text,
	private String periodicaltype;// text,
	private String pubDay;// text,
	private String summary;// text COLLATE "zh_CN.utf8" NOT NULL,
	private String keywords;// text COLLATE "zh_CN.utf8",
	private String ref_param;// text);
	private String createTime;
	private String authors;
	private long sortNum;
	private long shareId;
	
	
	public String getCreateTime() {
		return createTime;
	}
	public void setCreateTime(String createTime) {
		this.createTime = createTime;
	}
	@Column(DE.text_de)
	public String getAuthors() {
		return authors;
	}
	public void setAuthors(String authors) {
		this.authors = authors;
	}
	@Column(DE.long_de)
	public long getSortNum() {
		return sortNum;
	}
	public void setSortNum(long sortNum) {
		this.sortNum = sortNum;
	}
	@Column(DE.id_32)
	public String getId() {
		return id;
	}
	public void setId(String id) {
		this.id = id;
	}
	@Column(DE.text_de)
	public String getName() {
		return name;
	}
	public void setName(String name) {
		this.name = name;
	}
	@Column(value=DE.long_de)
	public long getPageViews() {
		return pageViews;
	}
	public void setPageViews(long pageViews) {
		this.pageViews = pageViews;
	}
	@Column(DE.Text_de)
	public String getCn4periodical() {
		return cn4periodical;
	}
	public void setCn4periodical(String cn4periodical) {
		this.cn4periodical = cn4periodical;
	}
	@Column(DE.Text_de)
	public String getEn4periodical() {
		return en4periodical;
	}
	public void setEn4periodical(String en4periodical) {
		this.en4periodical = en4periodical;
	}
	@Column(DE.Text_de)
	public String getPeriodicaltype() {
		return periodicaltype;
	}
	public void setPeriodicaltype(String periodicaltype) {
		this.periodicaltype = periodicaltype;
	}
	@Column(DE.text_de)
	public String getPubDay() {
		return pubDay;
	}
	public void setPubDay(String pubDay) {
		this.pubDay = pubDay;
	}
	@Column(DE.text_de)
	public String getSummary() {
		return summary;
	}
	public void setSummary(String summary) {
		this.summary = summary;
	}
	@Column(DE.Text_de)
	public String getKeywords() {
		return keywords;
	}
	public void setKeywords(String keywords) {
		this.keywords = keywords;
	}
	@Column(DE.Text_de)
	public String getRef_param() {
		return ref_param;
	}
	public void setRef_param(String ref_param) {
		this.ref_param = ref_param;
	}
	@Column(DE.bigSerial)
	public long getShareId() {
		return shareId;
	}
	public void setShareId(long shareId) {
		this.shareId = shareId;
	}
	
	
	
}

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

@@ -0,0 +1,163 @@
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("id")
@Table
public class Ppatent implements CreateTimeSupported {
	private String id;// char(32) NOT NULL,
	private String name;// text COLLATE "zh_CN.utf8" NOT NULL,
	private long pageViews;// int8 DEFAULT 0 NOT NULL,
	private String code;// text NOT NULL,
	private String reqCode;// text NOT NULL,
	private String reqPerson;// text COLLATE "zh_CN.utf8",
	private String reqDay;// char(8) NOT NULL,
	private String pubDay;// char(8) NOT NULL,
	private String summary;// text COLLATE "zh_CN.utf8" NOT NULL,
	private String ref_param;// text ,
	private String keywords;// text COLLATE "zh_CN.utf8"
	private String createTime;
	private String authors;
	private long sortNum;
	private long shareId;
	public String getCreateTime() {
		return createTime;
	}
	public void setCreateTime(String createTime) {
		this.createTime = createTime;
	}
	@Column(DE.text_de)
	public String getAuthors() {
		return authors;
	}
	public void setAuthors(String authors) {
		this.authors = authors;
	}
	@Column(DE.long_de)
	public long getSortNum() {
		return sortNum;
	}
	public void setSortNum(long sortNum) {
		this.sortNum = sortNum;
	}
	@Column(DE.id_32)
	public String getId() {
		return id;
	}
	public void setId(String id) {
		this.id = id;
	}
	@Column(DE.text_de)
	public String getName() {
		return name;
	}
	public void setName(String name) {
		this.name = name;
	}
	@Column(DE.long_de)
	public long getPageViews() {
		return pageViews;
	}
	public void setPageViews(long pageViews) {
		this.pageViews = pageViews;
	}
	@Column(DE.Text_de)
	public String getCode() {
		return code;
	}
	public void setCode(String code) {
		this.code = code;
	}
	@Column(DE.Text_de)
	public String getReqCode() {
		return reqCode;
	}
	public void setReqCode(String reqCode) {
		this.reqCode = reqCode;
	}
	@Column(DE.Text_de)
	public String getReqPerson() {
		return reqPerson;
	}
	public void setReqPerson(String reqPerson) {
		this.reqPerson = reqPerson;
	}
	@Column(DE.Text_de)
	public String getReqDay() {
		return reqDay;
	}
	public void setReqDay(String reqDay) {
		this.reqDay = reqDay;
	}
	@Column(DE.Text_de)
	public String getPubDay() {
		return pubDay;
	}
	public void setPubDay(String pubDay) {
		this.pubDay = pubDay;
	}
	@Column(DE.text_de)
	public String getSummary() {
		return summary;
	}
	public void setSummary(String summary) {
		this.summary = summary;
	}
	@Column(DE.Text_de)
	public String getRef_param() {
		return ref_param;
	}
	public void setRef_param(String ref_param) {
		this.ref_param = ref_param;
	}
	@Column(DE.Text_de)
	public String getKeywords() {
		return keywords;
	}
	public void setKeywords(String keywords) {
		this.keywords = keywords;
	}
	@Column(DE.bigSerial)
	public long getShareId() {
		return shareId;
	}
	public void setShareId(long shareId) {
		this.shareId = shareId;
	}
	
}

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

@@ -54,6 +54,7 @@ public class Professor implements CreateTimeSupported, ModifyTimeSupported{
	private Integer scoreValue;
	private Integer growthValue;
	private String scorePercent;
	private long shareId;
	
	private Organization organization;
	private List<Resource> resources;
@@ -332,5 +333,14 @@ public class Professor implements CreateTimeSupported, ModifyTimeSupported{
	public void setScorePercent(String scorePercent) {
		this.scorePercent = scorePercent;
	}
	@Column(DE.bigSerial)
	public long getShareId() {
		return shareId;
	}
	public void setShareId(long shareId) {
		this.shareId = shareId;
	}
	
}

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

@@ -77,6 +77,8 @@ public class Resource implements CreateTimeSupported, ModifyTimeSupported{
	private String resourceType;
	private String orgId;
	
	private long shareId;
	
	public List<Image> getImages() {
		return images;
	}
@@ -269,5 +271,13 @@ public class Resource implements CreateTimeSupported, ModifyTimeSupported{
	public void setOrgId(String orgId) {
		this.orgId = orgId;
	}
	@Column(DE.bigSerial)
	public long getShareId() {
		return shareId;
	}
	public void setShareId(long shareId) {
		this.shareId = shareId;
	}
	
	
}

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

@@ -5,7 +5,6 @@ import org.jfw.apt.orm.annotation.entry.PrimaryKey;
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.defaultImpl.WIntHandler;
import org.jfw.apt.orm.core.enums.DE;
import com.ekexiu.portal.basepo.CreateTimeSupported;
@@ -18,7 +17,7 @@ public class Watch implements CreateTimeSupported {
	private String professorId;
	private String watchObject;
	private String createTime;
	private Integer watchType;
	private short watchType;
	private EditProfessor professor;
	private Resource resource;
	private Article article;
@@ -50,7 +49,7 @@ public class Watch implements CreateTimeSupported {
		this.professorId = professorId;
	}
	
	@Column(DE.id_32)
	@Column(DE.string_de)
	public String getWatchObject() {
		return watchObject;
	}
@@ -65,11 +64,11 @@ public class Watch implements CreateTimeSupported {
		this.createTime = createTime;
	}
	
	@Column(handlerClass=WIntHandler.class,dbType="INT",insertable=true,nullable=false,renewable=true,queryable=true)
	public Integer getWatchType() {
	@Column(DE.short_de)
	public short getWatchType() {
		return watchType;
	}
	public void setWatchType(Integer watchType) {
	public void setWatchType(short watchType) {
		this.watchType = watchType;
	}
	

src/main/java/com/ekexiu/portal/pojo/AssedPaper.java

@@ -0,0 +1,40 @@
package com.ekexiu.portal.pojo;
import org.jfw.apt.orm.annotation.entry.CalcColumn;
import org.jfw.apt.orm.annotation.entry.ExtendView;
import org.jfw.apt.orm.core.defaultImpl.FixLenStringHandler;
import org.jfw.apt.orm.core.defaultImpl.StringHandler;
import com.ekexiu.portal.po.Ppaper;
@ExtendView(fromSentence = "PPAPER P INNER JOIN PAPER_AUTHOR A ON P.ID=A.PAPER_ID", tableAlias = "P")
public class AssedPaper extends Ppaper {
	
	private String professorId;
	private String authorName;
	private String assTime;
	
	@CalcColumn(column = "A.PROFESSOR_ID PROFESSOR_ID",handlerClass=FixLenStringHandler.class,nullable=false)
	public String getProfessorId() {
		return professorId;
	}
	public void setProfessorId(String professorId) {
		this.professorId = professorId;
	}
	@CalcColumn(column = "A.NAME AUTHOR_NAME",handlerClass=StringHandler.class,nullable=false)
	public String getAuthorName() {
		return authorName;
	}
	public void setAuthorName(String authorName) {
		this.authorName = authorName;
	}
	@CalcColumn(column="A.ASS_TIME ASS_TIME",handlerClass=StringHandler.class,nullable=false)
	public String getAssTime() {
		return assTime;
	}
	public void setAssTime(String assTime) {
		this.assTime = assTime;
	}
	
	
}

src/main/java/com/ekexiu/portal/pojo/AssedPatent.java

@@ -0,0 +1,37 @@
package com.ekexiu.portal.pojo;
import org.jfw.apt.orm.annotation.entry.CalcColumn;
import org.jfw.apt.orm.annotation.entry.ExtendView;
import org.jfw.apt.orm.core.defaultImpl.FixLenStringHandler;
import org.jfw.apt.orm.core.defaultImpl.StringHandler;
import com.ekexiu.portal.po.Ppatent;
@ExtendView(fromSentence = "PPATENT P INNER JOIN PATENT_AUTHOR A ON P.ID=A.PATENT_ID", tableAlias = "P")
public class AssedPatent extends Ppatent {
	private String professorId;
	private String authorName;
	private String assTime;
	
	@CalcColumn(column = "A.PROFESSOR_ID PROFESSOR_ID",handlerClass=FixLenStringHandler.class,nullable=false)
	public String getProfessorId() {
		return professorId;
	}
	public void setProfessorId(String professorId) {
		this.professorId = professorId;
	}
	@CalcColumn(column = "A.NAME AUTHOR_NAME",handlerClass=StringHandler.class,nullable=false)
	public String getAuthorName() {
		return authorName;
	}
	public void setAuthorName(String authorName) {
		this.authorName = authorName;
	}
	@CalcColumn(column="A.ASS_TIME ASS_TIME",handlerClass=StringHandler.class,nullable=false)
	public String getAssTime() {
		return assTime;
	}
	public void setAssTime(String assTime) {
		this.assTime = assTime;
	}
}

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

@@ -592,6 +592,12 @@ public class ArticleService {
		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);
	}
	
	@Get
	@Path("/qaForDesk")
	public List<Article> queryForDesk(@JdbcConn Connection con, String professorId) throws SQLException{
@@ -610,6 +616,12 @@ public class ArticleService {
		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);
	}
	
	@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{
@@ -744,5 +756,11 @@ public class ArticleService {
		this.articleAgreeDao.delete(con, articleId);
		this.watchDao.deleteWatch(con, articleId);
	}
	
	@Path("/byShareId")
	@Get
	public Article query(@JdbcConn Connection con,long id) throws SQLException{
		return this.articleDao.query(con, id);
	}
}

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

@@ -4,6 +4,7 @@ import java.sql.Connection;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
import java.util.ListIterator;
import org.jfw.apt.annotation.Autowrie;
import org.jfw.apt.annotation.DefaultValue;
@@ -23,17 +24,16 @@ import com.ekexiu.portal.pojo.DataDictCode;
@Path("/dataDict")
public class DataDictService {
	
	private volatile List<DataDictCode> hotSubjects = new ArrayList<DataDictCode>();
	private volatile List<DataDictCode> hotIndustries = new ArrayList<DataDictCode>();
	private volatile List<DataDictCode> hotKey = new ArrayList<DataDictCode>();
	
	@Autowrie
	private DataDictDao dataDictDao;
	
	private int defautLimitQuerySize = 5;
	
	
	public DataDictDao getDataDictDao() {
		return dataDictDao;
	}
@@ -47,8 +47,8 @@ public class DataDictService {
	}
	public void setDefautLimitQuerySize(int defautLimitQuerySize) {
		if(defautLimitQuerySize>0)
		   this.defautLimitQuerySize = defautLimitQuerySize;
		if (defautLimitQuerySize > 0)
			this.defautLimitQuerySize = defautLimitQuerySize;
	}
	public List<DataDictCode> getHotSubjects() {
@@ -77,9 +77,9 @@ public class DataDictService {
	@Post
	@Path
	public void insert(@JdbcConn(true) Connection con,String dictCode,String code,@Nullable String parentCode,String caption,String descp ) throws SQLException
	{
		DataDict  dd = new DataDict();
	public void insert(@JdbcConn(true) Connection con, String dictCode, String code, @Nullable String parentCode, String caption, String descp)
			throws SQLException {
		DataDict dd = new DataDict();
		dd.setDescp(descp);
		dd.setCaption(caption);
		dd.setCode(code);
@@ -87,82 +87,87 @@ public class DataDictService {
		dd.setParentCode(parentCode);
		dataDictDao.insert(con, dd);
	}
	
	@Put
	@Path
	public void update(@JdbcConn(true) Connection con,@RequestBody DataDict dict) throws SQLException{
	public void update(@JdbcConn(true) Connection con, @RequestBody DataDict dict) throws SQLException {
		this.dataDictDao.update(con, dict);
	}
	
	@Get
	@Path("/{dictCode}")
	List<DataDict> query(@JdbcConn(false) Connection con,@PathVar String dictCode) throws SQLException{
		 return this.dataDictDao.query(con, dictCode);
	List<DataDict> query(@JdbcConn(false) Connection con, @PathVar String dictCode) throws SQLException {
		return this.dataDictDao.query(con, dictCode);
	}
	
	@Get
	@Path("/qa/{dictCode}")
	public List<DataDictCode> queryDict( @PathVar String dictCode) throws SQLException{
		 return this.queryDictCode(dictCode.equals("SUBJECT"));
	public List<DataDictCode> queryDict(@PathVar String dictCode) throws SQLException {
		return this.queryDictCode(dictCode.equals("SUBJECT"));
	}
	
	@Get
	@Path("/qaDictCode")
	public List<DataDictCode> queryDictCode(String dictCode) throws SQLException{
		 return this.queryDictCode(dictCode.equals("SUBJECT"));
	public List<DataDictCode> queryDictCode(String dictCode) throws SQLException {
		return this.queryDictCode(dictCode.equals("SUBJECT"));
	}
	
	@Get
	@Path("/qaHotKey")
	public List<DataDictCode> queryHotKey(String key){
	public List<DataDictCode> queryHotKey(String key) {
		List<DataDictCode> hotKeys = this.getHotKey();
		List<DataDictCode> keys = new ArrayList<DataDictCode>();
		for (DataDictCode hotKey : hotKeys) {
			if(hotKey.getCaption().indexOf(key) != -1){
			if (hotKey.getCaption().indexOf(key) != -1) {
				keys.add(hotKey);
			}
		}
		return keys;
	}
	
	@Get
	@Path("/qlHotKey")
	public List<DataDictCode> hotKey(@DefaultValue("10") int rows){
	public List<DataDictCode> hotKey(@DefaultValue("10") int rows) {
		List<DataDictCode> hotKeys = this.getHotKey();
		List<DataDictCode> keys = new ArrayList<DataDictCode>();
		for (int i = 0; i < rows; i++) {
			keys.add(hotKeys.get(i));
		ListIterator<DataDictCode> it = hotKeys.listIterator();
		while (it.hasNext() && (rows > 0)) {
			--rows;
			keys.add(it.next());
		}
		return keys;
	}
	
	private List<DataDictCode> queryDictCode(boolean isSubject){
	private List<DataDictCode> queryDictCode(boolean isSubject) {
		List<DataDictCode> ret = null;
		if(isSubject){
		if (isSubject) {
			ret = this.getHotSubjects();
		}else{
		} else {
			ret = this.getHotIndustries();
		}
		return ret;
	}
	
	@Get
	@Path("/qaCity")
	public List<DataDictCode> queryCity(@JdbcConn(false) Connection con,String dictCode,@Nullable String province) throws SQLException{
	public List<DataDictCode> queryCity(@JdbcConn(false) Connection con, String dictCode, @Nullable String province) throws SQLException {
		return this.dataDictDao.queryCity(con, dictCode, province);
	}
	
	@Get
	@Path("/{dictCode}/{code}")
	public DataDict query(@JdbcConn(false) Connection con,@PathVar String dictCode,@PathVar String code)throws SQLException{
		return this.dataDictDao.query(con, dictCode, code);	
	public DataDict query(@JdbcConn(false) Connection con, @PathVar String dictCode, @PathVar String code) throws SQLException {
		return this.dataDictDao.query(con, dictCode, code);
	}
	
	@Get
	@Path("/lq")
	List<LogicDict> limitQuery(@JdbcConn(false) Connection con,String dictCode,@Nullable String caption,@DefaultValue("5") int rows) throws SQLException{
		if(rows<=0) rows = this.defautLimitQuerySize;
		if(caption!=null) caption="%"+caption+"%";
	List<LogicDict> limitQuery(@JdbcConn(false) Connection con, String dictCode, @Nullable String caption, @DefaultValue("5") int rows) throws SQLException {
		if (rows <= 0)
			rows = this.defautLimitQuerySize;
		if (caption != null)
			caption = "%" + caption + "%";
		return this.dataDictDao.limitQuery(con, dictCode, caption, rows);
	}

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

@@ -13,9 +13,12 @@ import org.jfw.apt.web.annotation.operate.Get;
import org.jfw.apt.web.annotation.operate.Post;
import org.jfw.apt.web.annotation.param.JdbcConn;
import org.jfw.apt.web.annotation.param.PathVar;
import org.jfw.util.PageQueryResult;
import org.jfw.util.StringUtil;
import com.ekexiu.portal.dao.OrgDao;
import com.ekexiu.portal.dao.OrgRegInfoDao;
import com.ekexiu.portal.po.OrgRegInfo;
import com.ekexiu.portal.po.Organization;
import com.ekexiu.portal.pojo.EditOrganization;
@@ -33,6 +36,19 @@ public class OrgService {
	@Autowrie
	private OrgDao orgDao;
	
	@Autowrie
	private OrgRegInfoDao orgRegInfoDao;
	
	
	
	public OrgRegInfoDao getOrgRegInfoDao() {
		return orgRegInfoDao;
	}
	public void setOrgRegInfoDao(OrgRegInfoDao orgRegInfoDao) {
		this.orgRegInfoDao = orgRegInfoDao;
	}
	public ImageService getImageService() {
		return imageService;
	}
@@ -151,4 +167,40 @@ public class OrgService {
		return id;
	}
	
	@Path("/incPageViews")
	@Post
	public void incPageViews(@JdbcConn(true) Connection con ,String id)throws SQLException{
		this.orgDao.incPageViews(con, id);
	}
	
	@Get
	@Path("/regInfo")
	public OrgRegInfo queryRegInfo(@JdbcConn Connection con,String name) throws SQLException{
		return this.orgRegInfoDao.query(con, name);
	}
	@Get
	@Path("/byShareId")
	public Organization query(@JdbcConn Connection con,long id)throws SQLException{
		return this.orgDao.query(con, id);
	}
	
	@Get
	@Path("/find/pq")
	public PageQueryResult<EditOrganization> pageQuery(@JdbcConn Connection con,@Nullable String kw,@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);
		for (EditOrganization organization : pqr.getData()) {
			organization.setHasOrgLogo(this.imageService.hasOrgLogo(organization.getId()));
		}
		return pqr;
	}
	@Get
	@Path("/qm")
	public List<EditOrganization> query(@JdbcConn Connection con,String[] id)throws SQLException{
		List<EditOrganization> ret = this.orgDao.query(con, id);
		for (EditOrganization organization :ret) {
			organization.setHasOrgLogo(this.imageService.hasOrgLogo(organization.getId()));
		}
		return ret;
	}
}

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

@@ -0,0 +1,146 @@
package com.ekexiu.portal.service;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.List;
import org.jfw.apt.annotation.Autowrie;
import org.jfw.apt.annotation.DefaultValue;
import org.jfw.apt.annotation.Nullable;
import org.jfw.apt.web.annotation.Path;
import org.jfw.apt.web.annotation.operate.Get;
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.PpaperDao;
import com.ekexiu.portal.po.PaperAuthor;
import com.ekexiu.portal.po.Ppaper;
import com.ekexiu.portal.pojo.AssedPaper;
@Path("/ppaper")
public class PpaperService {
	@Autowrie
	private PpaperDao ppaperDao;
	@Autowrie
	private PaperAuthorDao paperAuthorDao;
	public PpaperDao getPpaperDao() {
		return ppaperDao;
	}
	public void setPpaperDao(PpaperDao ppaperDao) {
		this.ppaperDao = ppaperDao;
	}
	public PaperAuthorDao getPaperAuthorDao() {
		return paperAuthorDao;
	}
	public void setPaperAuthorDao(PaperAuthorDao paperAuthorDao) {
		this.paperAuthorDao = paperAuthorDao;
	}
	@Get
	@Path("/qo")
	public Ppaper query(@JdbcConn Connection con, String id) throws SQLException {
		return this.ppaperDao.query(con, id);
	}
	@Get
	@Path("/qm")
	public List<Ppaper> query(@JdbcConn Connection con, String[] id) throws SQLException {
		return this.ppaperDao.query(con, id);
	}
	@Get
	@Path("/byProfessor")
	public PageQueryResult<AssedPaper> queryByProfessor(@JdbcConn Connection con, String id, @Nullable String name, @DefaultValue("10") int pageSize,
			@DefaultValue("1") int pageNo) throws SQLException {
		if (name == null) {
			name = "%";
		} else {
			name = "%" + name + "%";
		}
		return this.ppaperDao.pageQueryWithProfessor(con, id, name, pageSize, pageNo);
	}
	@Get
	@Path("/byAuthor")
	public PageQueryResult<AssedPaper> queryByAuthor(@JdbcConn Connection con, String author, String id, @Nullable String name,
			@DefaultValue("10") int pageSize, @DefaultValue("1") int pageNo) throws SQLException {
		if (name == null) {
			name = "%";
		} else {
			name = "%" + name + "%";
		}
		return this.ppaperDao.pageQueryWithAuthor(con, author, id, name, pageSize, pageNo);
	}
	@Get
	@Path("/authors")
	public List<PaperAuthor> queryAuthors(@JdbcConn Connection con, String id) throws SQLException {
		return this.paperAuthorDao.query(con, id);
	}
	@Get
	@Path("/pq")
	public PageQueryResult<Ppaper> pageQuery(@JdbcConn Connection con, @Nullable String qw, @DefaultValue("20") int pageSize, @DefaultValue("1") int pageNo)
			throws SQLException {
		return null == qw ? this.ppaperDao.query(con, pageSize, pageNo) : this.ppaperDao.query(con, "%" + qw + "%", pageSize, pageNo);
	}
	/**
	 * 
	 * @param con
	 * @param uid
	 *            专家ID(用户ID)
	 * @param id
	 *            论文ID
	 * @param author
	 *            作者名称
	 * @return
	 * @throws SQLException
	 */
	@Post
	@Path("/ass")
	public int ass(@JdbcConn(true) Connection con, String uid, String id, String author) throws SQLException {
		return this.paperAuthorDao.update(con, id, uid, author);
	}
	/**
	 * 
	 * @param con
	 * @param uid
	 *            专家ID(用户ID)
	 * @param id
	 *            论文ID
	 * @return
	 * @throws SQLException
	 */
	@Post
	@Path("/cAss")
	public int cAss(@JdbcConn(true) Connection con, String uid, String id) throws SQLException {
		return this.paperAuthorDao.update(con, id, uid);
	}
	@Post
	@Path("/incPageViews")
	public void incPageViews(@JdbcConn(true) Connection con, String id) throws SQLException {
		this.ppaperDao.incPageViews(con, id);
	}
	@Post
	@Path("/kw")
	public void update(@JdbcConn(true) Connection con, String id, @Nullable String keywords) throws SQLException {
		this.ppaperDao.update(con, id, keywords);
	}
	@Get
	@Path("/byShareId")
	public Ppaper query(@JdbcConn Connection con,long id) throws SQLException{
		return this.ppaperDao.query(con,id);
	}
}

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

@@ -0,0 +1,143 @@
package com.ekexiu.portal.service;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.List;
import org.jfw.apt.annotation.Autowrie;
import org.jfw.apt.annotation.DefaultValue;
import org.jfw.apt.annotation.Nullable;
import org.jfw.apt.web.annotation.Path;
import org.jfw.apt.web.annotation.operate.Get;
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.PatentAuthorDao;
import com.ekexiu.portal.dao.PpatentDao;
import com.ekexiu.portal.po.PatentAuthor;
import com.ekexiu.portal.po.Ppatent;
import com.ekexiu.portal.pojo.AssedPatent;
@Path("/ppatent")
public class PpatentServcie {
	@Autowrie
	private PpatentDao ppatentDao;
	@Autowrie
	private PatentAuthorDao patentAuthorDao;
	
	
	
	public PpatentDao getPpatentDao() {
		return ppatentDao;
	}
	public void setPpatentDao(PpatentDao ppatentDao) {
		this.ppatentDao = ppatentDao;
	}
	public PatentAuthorDao getpatentAuthorDao() {
		return patentAuthorDao;
	}
	public void setPatentAuthorDao(PatentAuthorDao paperAuthorDao) {
		this.patentAuthorDao = paperAuthorDao;
	}
	@Get
	@Path("/qo")
	public Ppatent query(@JdbcConn Connection con,String id)throws SQLException{
		return this.ppatentDao.query(con, id);
	}
	@Get
	@Path("/qm")
	public List<Ppatent> query(@JdbcConn Connection con,String[] id)throws SQLException{
		return this.ppatentDao.query(con, id);
	}
	
	@Get
	@Path("/byProfessor")
	public PageQueryResult<AssedPatent> queryByProfessor(@JdbcConn Connection con,String id,@Nullable String name,@DefaultValue("10") int pageSize,@DefaultValue("1") int pageNo)throws SQLException{
		if(name == null ){
			name ="%";
		}else{
			name ="%"+name+"%";
		}
		return this.ppatentDao.pageQueryWithProfessor(con, id, name, pageSize, pageNo);
	}
	@Get
	@Path("/byAuthor")
	public PageQueryResult<AssedPatent> queryByAuthor(@JdbcConn Connection con,String author,String id,@Nullable String name,@DefaultValue("10") int pageSize,@DefaultValue("1") int pageNo)throws SQLException{
		if(name == null ){
			name ="%";
		}else{
			name ="%"+name+"%";
		}
		return this.ppatentDao.pageQueryWithAuthor(con, author,id, name, pageSize, pageNo);
	}
	
	@Get
	@Path("/authors")
	public List<PatentAuthor> queryAuthors(@JdbcConn Connection con,String id)throws SQLException{
		return this.patentAuthorDao.query(con,id);
	}
	@Get
	@Path("/pq")
	public PageQueryResult<Ppatent> pageQuery(@JdbcConn Connection con, @Nullable String qw, @DefaultValue("20") int pageSize, @DefaultValue("1") int pageNo)
			throws SQLException {
		return null == qw ? this.ppatentDao.query(con, pageSize, pageNo) : this.ppatentDao.query(con, "%" + qw + "%", pageSize, pageNo);
	}
	/**
	 * 
	 * @param con
	 * @param uid 专家ID(用户ID) 
	 * @param id  论文ID
	 * @param author 作者名称
	 * @return
	 * @throws SQLException
	 */
	@Post
	@Path("/ass")
	public int ass(@JdbcConn(true) Connection con,String uid,String id,String author)throws SQLException{
		return this.patentAuthorDao.update(con, id, uid, author);
	}
	/**
	 * 
	 * @param con
	 * @param uid 专家ID(用户ID) 
	 * @param id  论文ID
	 * @return
	 * @throws SQLException
	 */
	@Post
	@Path("/cAss")
	public int cAss(@JdbcConn(true) Connection con,String uid,String id)throws SQLException{
		return this.patentAuthorDao.update(con, id, uid);
	}	
	
	@Post
	@Path("/incPageViews")
	public void incPageViews(@JdbcConn(true) Connection con,String id)throws SQLException{
		this.ppatentDao.incPageViews(con, id);
	}
	
	@Post
	@Path("/kw")
	public void update(@JdbcConn(true) Connection con,String id,@Nullable String keywords)throws SQLException{
		this.ppatentDao.update(con, id, keywords);
	}
	@Get
	@Path("/byShareId")
	public Ppatent query(@JdbcConn Connection con,long id)throws SQLException{
		return this.ppatentDao.query(con,id);
	}
}

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

@@ -666,6 +666,11 @@ public class ProfessorService {
		return info;
		
	}
	@Get
	@Path("/byShareId")
	public Professor query(@JdbcConn Connection con,long id)throws SQLException{
		return this.professorDao.query(con,id);
	}
	
	public static void main(String[] args)throws Exception{
//		Connection con = DriverManager.getConnection("jdbc:postgresql://121.42.53.174:5432/ekexiu", "postgres",  "postgres");

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

@@ -776,6 +776,18 @@ public class ResourceService {
		}
		return resources;
	}
	@Get
	@Path("/pqProPublish")
	public PageQueryResult<Resource> pageQueryProPublish(@JdbcConn Connection con, String professorId,@DefaultValue("10") int pageSize,@DefaultValue("1") int pageNo) throws SQLException {
		PageQueryResult<Resource> resources = this.resourceDao.pageQueryProPublish(con, professorId,pageSize,pageNo);
		List<Resource> list = resources.getData();
		if(list!=null && list.size()>0) {
			for (Resource resource : list) {
				resource.setImages(this.imageDao.queryRes(con, resource.getResourceId()));
			}
		}
		return resources;
	}
	
	@Get
	@Path("/qaForDesk")
@@ -800,6 +812,18 @@ public class ResourceService {
		}
		return resources;
	}
	@Get
	@Path("/pqOrgPublish")
	public PageQueryResult<Resource> pageQueryOrgPublish(@JdbcConn Connection con, String orgId,@DefaultValue("10") int pageSize,@DefaultValue("1") int pageNo) throws SQLException {
		PageQueryResult<Resource> resources = this.resourceDao.pageQueryOrgPublish(con, orgId,pageSize,pageNo);
		List<Resource> list = resources.getData();
		if(list!=null && list.size()>0) {
			for (Resource resource : list) {
				resource.setImages(this.imageDao.queryRes(con, resource.getResourceId()));
			}
		}
		return resources;
	}
	
	@Post
	@Path("/nameAndSupport")
@@ -923,5 +947,9 @@ public class ResourceService {
		}
		return queryResult;
	}
	
	@Get
	@Path("/byShareId")
	public Resource query(@JdbcConn Connection con,long id)throws SQLException{
		return this.resourceDao.query(con,id);
	}
}

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

@@ -14,6 +14,7 @@ import javax.mail.MessagingException;
import org.apache.log4j.Logger;
import org.jfw.apt.annotation.Autowrie;
import org.jfw.apt.annotation.DefaultValue;
import org.jfw.apt.annotation.Nullable;
import org.jfw.apt.web.annotation.Path;
import org.jfw.apt.web.annotation.method.SetCookie;
@@ -29,6 +30,8 @@ import org.jfw.util.state.StateCode;
import com.ekexiu.portal.dao.OrgDao;
import com.ekexiu.portal.dao.OrgUserDao;
import com.ekexiu.portal.dao.PaperAuthorDao;
import com.ekexiu.portal.dao.PatentAuthorDao;
import com.ekexiu.portal.dao.ProfessorDao;
import com.ekexiu.portal.dao.UserDao;
import com.ekexiu.portal.dao.UserOpenIdDao;
@@ -74,6 +77,11 @@ public class SysService {
	@Autowrie
	private UserOpenIdDao userOpenIdDao;
	@Autowrie
	private PatentAuthorDao patentAuthorDao;
	@Autowrie
	private PaperAuthorDao paperAuthorDao;
	private String bindMailSubject;
	private String bindMailReplaceKey;
@@ -102,6 +110,10 @@ public class SysService {
	private String bindMobilePhoneReplaceKey;
	private String bindMobilePhoneContentTemplate;
	private long timeLimitWithBindMobilePhone = 3 * 60 * 1000;
	
	private String basePhoneReplaceKey="yzm";
	private String basePhoneContentTemplate="【科袖】请输入验证码yzm，完成手机验证。请于3分钟内正确输入验证码。如非本人操作，请忽略本短信。";
	private long timeLimitWithBasePhone= 3*60*1000;
	private String phoneRetrievePasswordReplaceKey;
	private String phoneRetrievePasswordContentTemplate;
@@ -143,6 +155,48 @@ public class SysService {
	private String retrieveOrgFailTempalte;
	private String retrieveOrgFailSubject;
	
	
	public String getBasePhoneReplaceKey() {
		return basePhoneReplaceKey;
	}
	public void setBasePhoneReplaceKey(String basePhoneReplaceKey) {
		this.basePhoneReplaceKey = basePhoneReplaceKey;
	}
	public String getBasePhoneContentTemplate() {
		return basePhoneContentTemplate;
	}
	public void setBasePhoneContentTemplate(String basePhoneContentTemplate) {
		this.basePhoneContentTemplate = basePhoneContentTemplate;
	}
	public long getTimeLimitWithBasePhone() {
		return timeLimitWithBasePhone;
	}
	public void setTimeLimitWithBasePhone(long timeLimitWithBasePhone) {
		this.timeLimitWithBasePhone = timeLimitWithBasePhone;
	}
	public PatentAuthorDao getPatentAuthorDao() {
		return patentAuthorDao;
	}
	public void setPatentAuthorDao(PatentAuthorDao patentAuthorDao) {
		this.patentAuthorDao = patentAuthorDao;
	}
	public PaperAuthorDao getPaperAuthorDao() {
		return paperAuthorDao;
	}
	public void setPaperAuthorDao(PaperAuthorDao paperAuthorDao) {
		this.paperAuthorDao = paperAuthorDao;
	}
	public String getRegMailReplaceKey() {
		return regMailReplaceKey;
	}
@@ -753,7 +807,8 @@ public class SysService {
	 */
	@Post
	@Path("/regmobile")
	public String regMobile(@JdbcConn(true) Connection con, String state, String mobilePhone, String validateCode, String password, @Nullable String inviterId) throws SQLException, JfwBaseException {
	public String regMobile(@JdbcConn(true) Connection con, String state, String mobilePhone, String validateCode, String password, @Nullable String inviterId)
			throws SQLException, JfwBaseException {
		@SuppressWarnings("unchecked")
		StateCode<String, String> sc = (StateCode<String, String>) JfwAppContext.getCachedObject(state);
		if (sc == null || sc.getExpiredTime() < System.currentTimeMillis())
@@ -833,7 +888,7 @@ public class SysService {
	@Post
	@Path("/mobileReg")
	public String mobileReg(@JdbcConn(true) Connection con, String state, String mobilePhone, String validateCode, String password, @Nullable String inviterId,
			String name,	@Nullable String oauthType, @Nullable String openid, @Nullable String authCode) throws SQLException, JfwBaseException, IOException {
			String name, @Nullable String oauthType, @Nullable String openid, @Nullable String authCode) throws SQLException, JfwBaseException, IOException {
		@SuppressWarnings("unchecked")
		StateCode<String, String> sc = (StateCode<String, String>) JfwAppContext.getCachedObject(state);
		if (sc == null || sc.getExpiredTime() < System.currentTimeMillis())
@@ -868,6 +923,141 @@ public class SysService {
		}
	}
	@Post
	@Path("/regAndAssPatent")
	public int assPatent(@JdbcConn(true) Connection con, String state, String phone, String vc, @Nullable String inviterId, String name, String patent)
			throws SQLException, JfwBaseException, IOException {
		@SuppressWarnings("unchecked")
		StateCode<String, String> sc = (StateCode<String, String>) JfwAppContext.getCachedObject(state);
		if (sc == null || sc.getExpiredTime() < System.currentTimeMillis())
			throw new JfwBaseException(-1, "验证超时");
		if (!sc.getKey().equals(phone)) {
			throw new JfwBaseException(-2, "手机号与验证手机不匹配");
		}
		if (!sc.getValue().equals(vc)) {
			throw new JfwBaseException(-3, "验证码错误");
		}
		User user = null;
		boolean exists = false;
		String uid = StringUtil.buildUUID();
		try {
			try {
				user = new User();
				user.setId(uid);
				String passwd = StringUtil.md5("123456");
				user.setMobilePhone(phone);
				user.setPasswd(passwd);
				user.setUserType("0");
				user.setInviterId(inviterId);
				user.setActiveTime(DATE.format(new Date()));
				this.userDao.insert(con, user);
			} catch (SQLException e) {
				if ("23505".equals(e.getSQLState())) {
					con.rollback();
					user = userDao.queryByEmailOrMobilePhone(con, phone);
					if (user == null)
						throw new RuntimeException("not fonud  with query user by phone");
					exists = true;
					uid = user.getId();
				} else {
					throw e;
				}
			}
			if (exists) {
				Professor professor = this.professorDao.query(con, uid);
				if (professor == null) {
					professor = new Professor();
					professor.setId(uid);
					professor.setName(name);
					professor.setPhone(phone);
					this.professorService.insert(con, professor, null);
				} else {
					name = professor.getName();
				}
			} else {
				Professor professor = new Professor();
				professor.setId(uid);
				professor.setName(name);
				professor.setPhone(phone);
				this.professorService.insert(con, professor, null);
				if (inviterId != null) {
					this.growthLogService.invite(con, inviterId, uid);
				}
			}
			return (this.patentAuthorDao.update(con, patent, uid, name)  > 0?1:0) + (exists?0:10);
		} finally {
			JfwAppContext.removeCachedObject(state);
		}
	}
	@Post
	@Path("/regAndAssPaper")
	public int assPaper(@JdbcConn(true) Connection con, String state, String phone, String vc, @Nullable String inviterId, String name, String paper)
			throws SQLException, JfwBaseException, IOException {
		@SuppressWarnings("unchecked")
		StateCode<String, String> sc = (StateCode<String, String>) JfwAppContext.getCachedObject(state);
		if (sc == null || sc.getExpiredTime() < System.currentTimeMillis())
			throw new JfwBaseException(-1, "验证超时");
		if (!sc.getKey().equals(phone)) {
			throw new JfwBaseException(-2, "手机号与验证手机不匹配");
		}
		if (!sc.getValue().equals(vc)) {
			throw new JfwBaseException(-3, "验证码错误");
		}
		User user = null;
		boolean exists = false;
		String uid = StringUtil.buildUUID();
		try {
			try {
				user = new User();
				user.setId(uid);
				String passwd = StringUtil.md5("123456");
				user.setMobilePhone(phone);
				user.setPasswd(passwd);
				user.setUserType("0");
				user.setInviterId(inviterId);
				user.setActiveTime(DATE.format(new Date()));
				this.userDao.insert(con, user);
			} catch (SQLException e) {
				if ("23505".equals(e.getSQLState())) {
					con.rollback();
					user = userDao.queryByEmailOrMobilePhone(con, phone);
					if (user == null)
						throw new RuntimeException("not fonud  with query user by phone");
					exists = true;
					uid = user.getId();
				} else {
					throw e;
				}
			}
			if (exists) {
				Professor professor = this.professorDao.query(con, uid);
				if (professor == null) {
					professor = new Professor();
					professor.setId(uid);
					professor.setName(name);
					professor.setPhone(phone);
					this.professorService.insert(con, professor, null);
				} else {
					name = professor.getName();
				}
			} else {
				Professor professor = new Professor();
				professor.setId(uid);
				professor.setName(name);
				professor.setPhone(phone);
				this.professorService.insert(con, professor, null);
				if (inviterId != null) {
					this.growthLogService.invite(con, inviterId, uid);
				}
			}
			return (this.paperAuthorDao.update(con, paper, uid, name) > 0?1:0) + (exists?0:10);
		} finally {
			JfwAppContext.removeCachedObject(state);
		}
	}
	/**
	 * 邮箱验证并注册
	 * 
@@ -1288,7 +1478,7 @@ public class SysService {
	}
	@SetCookie(checkResultNull = true, path = "/", value = { "userid=result.getId()", "userMobilePhone=result.getMobilePhone()", "userType=result.getType()",
			"userEmail=result.getEmail()==null?\"\":result.getEmail()","authentication=result.getAuthentication()==null?\"\":result.getAuthentication()",
			"userEmail=result.getEmail()==null?\"\":result.getEmail()", "authentication=result.getAuthentication()==null?\"\":result.getAuthentication()",
			"userAuth=String.valueOf(result.isAuth())", "userName=result.getName()==null?\"\":java.net.URLEncoder.encode(result.getName(),\"utf-8\")" })
	@Post
	@Path("/invitelogin")
@@ -1308,14 +1498,14 @@ public class SysService {
		ret.setEmail(user.getEmail());
		if (professor != null) {
			ret.setName(professor.getName());
			ret.setAuthentication(professor.getAuthentication()+"");
			ret.setAuthentication(professor.getAuthentication() + "");
		}
		ret.setAuth(!DEFAULT_PASS_WORD.equals(user.getPasswd()));
		return ret;
	}
	@SetCookie(checkResultNull = true, path = "/", value = { "userid=result.getId()", "userMobilePhone=result.getMobilePhone()", "userType=result.getType()",
			"userEmail=result.getEmail()==null?\"\":result.getEmail()","authentication=result.getAuthentication()==null?\"\":result.getAuthentication()",
			"userEmail=result.getEmail()==null?\"\":result.getEmail()", "authentication=result.getAuthentication()==null?\"\":result.getAuthentication()",
			"userAuth=String.valueOf(result.isAuth())", "userName=result.getName()==null?\"\":java.net.URLEncoder.encode(result.getName(),\"utf-8\")" })
	@Post
	@Path("/slogin")
@@ -1331,16 +1521,16 @@ public class SysService {
		ret.setMobilePhone(mobile);
		ret.setType(user.getUserType());
		ret.setEmail(user.getEmail());
		if(professor != null){
		if (professor != null) {
			ret.setName(professor.getName());
			ret.setAuthentication(professor.getAuthentication()+"");
			ret.setAuthentication(professor.getAuthentication() + "");
		}
		ret.setAuth(!DEFAULT_PASS_WORD.equals(user.getPasswd()));
		return ret;
	}
	@SetCookie(checkResultNull = true, path = "/", value = { "userid=result.getId()", "userMobilePhone=result.getMobilePhone()", "userType=result.getType()",
			"userEmail=result.getEmail()==null?\"\":result.getEmail()","authentication=result.getAuthentication()==null?\"\":result.getAuthentication()",
			"userEmail=result.getEmail()==null?\"\":result.getEmail()", "authentication=result.getAuthentication()==null?\"\":result.getAuthentication()",
			"userAuth=String.valueOf(result.isAuth())", "userName=result.getName()==null?\"\":java.net.URLEncoder.encode(result.getName(),\"utf-8\")" })
	@Post
	@Path("/login")
@@ -1358,7 +1548,7 @@ public class SysService {
		Professor pf = this.professorDao.query(con, user.getId());
		if (null != pf) {
			ret.setName(pf.getName());
			ret.setAuthentication(pf.getAuthentication()+"");
			ret.setAuthentication(pf.getAuthentication() + "");
		}
		ret.setMobilePhone(user.getMobilePhone());
		ret.setType(user.getUserType());
@@ -1368,7 +1558,7 @@ public class SysService {
	}
	@SetCookie(checkResultNull = true, path = "/", value = { "userid=result.getId()", "userMobilePhone=result.getMobilePhone()", "userType=result.getType()",
			"userEmail=result.getEmail()==null?\"\":result.getEmail()","authentication=result.getAuthentication()==null?\"\":result.getAuthentication()",
			"userEmail=result.getEmail()==null?\"\":result.getEmail()", "authentication=result.getAuthentication()==null?\"\":result.getAuthentication()",
			"userAuth=String.valueOf(result.isAuth())", "userName=result.getName()==null?\"\":java.net.URLEncoder.encode(result.getName(),\"utf-8\")" })
	@Post
	@Path("/mobileLogin")
@@ -1394,7 +1584,7 @@ public class SysService {
			Professor professor = this.professorDao.query(con, user.getId());
			if (null != professor) {
				ret.setName(professor.getName());
				ret.setAuthentication(professor.getAuthentication()+"");
				ret.setAuthentication(professor.getAuthentication() + "");
			}
			ret.setMobilePhone(user.getMobilePhone());
			ret.setType(user.getUserType());
@@ -1406,8 +1596,8 @@ public class SysService {
		}
	}
	@SetCookie(checkResultNull = true, path = "/", value = { "orgId=result.getId()", "orgType=result.getType()",
			"orgAuth=String.valueOf(result.isAuth())","orgEmail=result.getEmail()==null?\"\":result.getEmail()",
	@SetCookie(checkResultNull = true, path = "/", value = { "orgId=result.getId()", "orgType=result.getType()", "orgAuth=String.valueOf(result.isAuth())",
			"orgEmail=result.getEmail()==null?\"\":result.getEmail()",
			"orgName=result.getName()==null?\"\":java.net.URLEncoder.encode(result.getName(),\"utf-8\")" })
	@Post
	@Path("/orgLogin")
@@ -1601,10 +1791,13 @@ public class SysService {
	 */
	@Get
	@Path("/regmobilephone")
	public String regMobilePhone(@JdbcConn(false) Connection con, String mobilePhone) throws JfwBaseException, SQLException {
		User user = this.userDao.queryByEmailOrMobilePhone(con, mobilePhone);
		if (null != user) {
			return null;
	public String regMobilePhone(@JdbcConn(false) Connection con, String mobilePhone, @DefaultValue("true") boolean checkExists)
			throws JfwBaseException, SQLException {
		if (checkExists) {
			User user = this.userDao.queryByEmailOrMobilePhone(con, mobilePhone);
			if (null != user) {
				return null;
			}
		}
		StateCode<String, String> sc = new StateCode<String, String>();
		final String key = JfwAppContext.cacheObjectAndGenKey(sc);
@@ -1631,6 +1824,36 @@ public class SysService {
		}
		return key;
	}
	
	
	@Get
	@Path("/phoneValidCode")
	public String phoneValidCode(String phone) throws JfwBaseException{
		StateCode<String, String> sc = new StateCode<String, String>();
		final String key = JfwAppContext.cacheObjectAndGenKey(sc);
		try {
			Random rd = new Random();
			int vi = rd.nextInt(10000);
			String vc = String.format("%04d", vi);
			sc.setKey(phone);
			sc.setValue(vc);
			this.mobilePhoneServcie.sendMessage(phone, this.basePhoneContentTemplate,basePhoneReplaceKey, vc);
			long ct = System.currentTimeMillis();
			long et = ct + this.timeLimitWithBasePhone + 5000;
			sc.setBuildTime(ct);
			sc.setExpiredTime(et);
			JfwAppContext.getScheduledExecutorService().schedule(new Runnable() {
				@Override
				public void run() {
					JfwAppContext.removeCachedObject(key);
				}
			}, this.timeLimitWithRegMobilePhone + 10000, TimeUnit.MILLISECONDS);
		} catch (Exception e) {
			JfwAppContext.removeCachedObject(key);
			throw new JfwBaseException(10012, "send mobile phone message to " + phone + " error", e);
		}
		return key;
	}
	@Get
	@Path("/sendMobileForLogin")

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

@@ -111,9 +111,11 @@ public class WatchService {
		return this.watchDao.queryOne(con, professorId, watchObject);
	}
	
	
	@Get
	@Path("/qaPro")
	public PageQueryResult<Watch> queryPro(@JdbcConn Connection con, String professorId, Integer watchType, 
	public PageQueryResult<Watch> queryPro(@JdbcConn Connection con, String professorId, short watchType, 
			@DefaultValue("10") int pageSize, @DefaultValue("1") int pageNo) throws SQLException {
		PageQueryResult<Watch> queryResult = this.watchDao.queryPro(con, professorId, watchType, pageSize, pageNo);
		List<Watch> watchs = queryResult.getData();
@@ -172,4 +174,15 @@ public class WatchService {
		return watchs;
	}
	
	@Get
	@Path("/countObject")
	public int countObject(@JdbcConn Connection con,String id,short type)throws SQLException{
		return this.watchDao.countWatchObject(con, id, type);
	}
	@Get
	@Path("/countProfessor")
	public int countProfessor(@JdbcConn Connection con,String id,short type)throws SQLException{
		return this.watchDao.countProfessor(con, id, type);
	}
	
}

src/main/java/com/ekexiu/push/service/FeedbackService.java

@@ -0,0 +1,120 @@
package com.ekexiu.push.service;
import java.sql.Connection;
import java.sql.SQLException;
import org.jfw.apt.annotation.Autowrie;
import org.jfw.apt.annotation.Nullable;
import org.jfw.apt.web.annotation.Path;
import org.jfw.apt.web.annotation.operate.Post;
import org.jfw.apt.web.annotation.param.JdbcConn;
import com.ekexiu.portal.dao.FeedbackDao;
import com.ekexiu.portal.po.Feedback;
@Path("/feedback")
public class FeedbackService {
	@Autowrie
	private FeedbackDao feedbackDao;
	public FeedbackDao getFeedbackDao() {
		return feedbackDao;
	}
	public void setFeedbackDao(FeedbackDao feedbackDao) {
		this.feedbackDao = feedbackDao;
	}
	
	@Post
	@Path("/error/patent")
	public long errorPatent(@JdbcConn(true) Connection con,String cnt,String id,@Nullable String user)throws SQLException{
		Feedback fb = new Feedback();
		fb.setCategory(1);
		fb.setSchema(2);
		fb.setParam(id);
		fb.setState("0");
		fb.setContent(cnt);
		fb.setUserId(user);
		return this.feedbackDao.insert(con, fb);
	}
	
	@Post
	@Path("/error/paper")
	public long errorPaper(@JdbcConn(true) Connection con,String cnt,String id,@Nullable String user)throws SQLException{
		Feedback fb = new Feedback();
		fb.setCategory(1);
		fb.setSchema(1);
		fb.setParam(id);
		fb.setState("0");
		fb.setContent(cnt);
		fb.setUserId(user);
		return this.feedbackDao.insert(con, fb);
	}
	@Post
	@Path("/error/professor")
	public long errorProfessor(@JdbcConn(true) Connection con,String cnt,String id,@Nullable String user)throws SQLException{
		Feedback fb = new Feedback();
		fb.setCategory(1);
		fb.setSchema(3);
		fb.setParam(id);
		fb.setState("0");
		fb.setContent(cnt);
		fb.setUserId(user);
		return this.feedbackDao.insert(con, fb);
	}
	
	@Post
	@Path("/error/org")
	public long errorOrg(@JdbcConn(true) Connection con,String cnt,String id,@Nullable String user)throws SQLException{
		Feedback fb = new Feedback();
		fb.setCategory(1);
		fb.setSchema(4);
		fb.setParam(id);
		fb.setState("0");
		fb.setContent(cnt);
		fb.setUserId(user);
		return this.feedbackDao.insert(con, fb);
	}
	
	@Post
	@Path("/error/resource")
	public long errorResource(@JdbcConn(true) Connection con,String cnt,String id,@Nullable String user)throws SQLException{
		Feedback fb = new Feedback();
		fb.setCategory(1);
		fb.setSchema(5);
		fb.setParam(id);
		fb.setState("0");
		fb.setContent(cnt);
		fb.setUserId(user);
		return this.feedbackDao.insert(con, fb);
	}
	
	@Post
	@Path("/error/article")
	public long errorArticle(@JdbcConn(true) Connection con,String cnt,String id,@Nullable String user)throws SQLException{
		Feedback fb = new Feedback();
		fb.setCategory(1);
		fb.setSchema(6);
		fb.setParam(id);
		fb.setState("0");
		fb.setContent(cnt);
		fb.setUserId(user);
		return this.feedbackDao.insert(con, fb);
	}
	
	@Post
	@Path("/error")
	public long error(@JdbcConn(true) Connection con,String cnt,String id,@Nullable String user,int schema)throws SQLException{
		Feedback fb = new Feedback();
		fb.setCategory(1);
		fb.setSchema(schema);
		fb.setParam(id);
		fb.setState("0");
		fb.setContent(cnt);
		fb.setUserId(user);
		return this.feedbackDao.insert(con, fb);
	}
	
	
}

src/main/java/com/ekexiu/push/service/PushService.java

@@ -0,0 +1,533 @@
package com.ekexiu.push.service;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.lang.reflect.Type;
import java.net.HttpURLConnection;
import java.net.URL;
import java.security.MessageDigest;
import java.security.cert.CertificateException;
import java.security.cert.X509Certificate;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
import javax.net.ssl.HostnameVerifier;
import javax.net.ssl.HttpsURLConnection;
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLSession;
import javax.net.ssl.TrustManager;
import javax.net.ssl.X509TrustManager;
import org.jfw.apt.web.annotation.Path;
import org.jfw.apt.web.annotation.operate.Get;
import org.jfw.apt.web.annotation.operate.Post;
import org.jfw.util.ConstData;
import org.jfw.util.io.IoUtil;
import org.jfw.util.json.JsonService;
import org.jfw.util.reflect.TypeReference;
import com.ekexiu.operation.push.getui.Message;
import com.ekexiu.operation.push.getui.MsgCondition;
import com.ekexiu.operation.push.getui.MsgStyle;
import com.ekexiu.operation.push.getui.NotificationMessage;
@Path("/push")
public class PushService {
	private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(PushService.class);
	private static Type RES_TYPE = new TypeReference<Map<String, Object>>() {
	}.getType();
	
	
	private static final MsgCondition  android=new MsgCondition("phonetype",new String[]{"ANDROID"},1);
	private static final MsgCondition  ios=new MsgCondition("phonetype",new String[]{"IOS"},1);
	
	private static final MsgCondition[]  onlyAndroid = new MsgCondition[]{android};
	
	private static final MsgCondition[]  onlyIos = new MsgCondition[]{ios};
	private static Map<String, String> CONTENT_TYPE = new HashMap<String, String>();
	private static Map<String, String> TOKEN_MAP = new ConcurrentHashMap<String, String>();
	private static Map<String, String> ERR_MAP = new HashMap<String, String>();
	final static char[] digits = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' };
	// UiIGJTfKNR8oXb8apYdGh3
	private String secret = "U96j677DHoA1Pv5X0mxMU9";
	private String appKey = "48nq7d7yHu8dgbzVHuisp6";
	private String appId = "TUdvbnxu1c97r6Fb6cUy57";
	private int timeout = 0;
	private String token = null;
	private long lastBuildTime = 0;
	public String getSecret() {
		return secret;
	}
	public void setSecret(String secret) {
		this.secret = secret;
	}
	public String getAppKey() {
		return appKey;
	}
	public void setAppKey(String appKey) {
		this.appKey = appKey;
	}
	public String getAppId() {
		return appId;
	}
	public void setAppId(String appId) {
		this.appId = appId;
	}
	public int getTimeout() {
		return timeout;
	}
	public void setTimeout(int timeout) {
		this.timeout = timeout;
	}
	private String buildSign(long flag) {
		String p = this.appKey + flag + this.secret;
		MessageDigest messageDigest;
		try {
			messageDigest = MessageDigest.getInstance("SHA-256");
			messageDigest.update(p.getBytes("UTF-8"));
			StringBuilder sb = new StringBuilder();
			for (byte b : messageDigest.digest()) {
				sb.append(digits[(b & 0xf0) >> 4]);
				sb.append(digits[b & 0xf]);
			}
			return sb.toString();
		} catch (Exception e) {
			throw new RuntimeException("jdk unsupported sh256???????????", e);
		}
	}
	private void checkResult(Map<String, Object> ret) {
		Object obj = ret.get("result");
		if ("ok".equals(obj))
			return;
		String errMsg = null;
		errMsg = ERR_MAP.get(obj);
		if (errMsg == null)
			errMsg = "其他错误";
		log.error("调用用个推restApi,返回结果错误：" + obj + ":" + errMsg);
		throw new RuntimeException("调用用个推restApi,返回结果错误：" + obj + ":" + errMsg);
	}
	private void checkToken() {
		if (this.token == null) {
			log.error("token is null");
			throw new RuntimeException("token is null");
		}
	}
	public String allocateRequesstId() {
		UUID uuid = UUID.randomUUID();
		return "A" + Long.toString(uuid.getLeastSignificantBits(), 36) + "_" + Long.toString(uuid.getMostSignificantBits(), 36);
	}
	private void buildToken() {
		if(true) return;
		long time = System.currentTimeMillis();
		String sign = this.buildSign(time);
		StringBuilder sb = new StringBuilder();
		sb.append("{\"sign\":\"").append(sign).append("\",\"timestamp\":\"").append(time).append("\",\"appkey\":\"").append(this.appKey).append("\"}");
		try {
			Map<String, Object> ret = post("https://restapi.getui.com/v1/" + this.appId + "/auth_sign", CONTENT_TYPE, sb.toString().getBytes(ConstData.UTF8));
			this.checkResult(ret);
			String otoken = (String) ret.get("auth_token");
			if (otoken == null) {
				throw new RuntimeException("返回token is null");
			}
			this.token = otoken;
			this.lastBuildTime = System.currentTimeMillis();
			TOKEN_MAP.put("authtoken", this.token);
		} catch (Exception e) {
			this.token = null;
			log.error("build token error", e);
		}
	}
	public void refresh() {
		if ((this.token != null) && ((System.currentTimeMillis() - this.lastBuildTime) < (24 * 60 * 60 * 1000 - 5000))) {
			return;
		}
		this.buildToken();
	}
	public Map<String, Object> post(String url, Map<String, String> header, byte[] data) throws IOException {
		HttpURLConnection connection = getConnection(url);
		try {
			connection.setRequestMethod("POST");
			connection.setUseCaches(false);
			for (Map.Entry<String, String> entry : header.entrySet()) {
				connection.setRequestProperty(entry.getKey(), entry.getValue());
			}
			connection.setDoOutput(true);
			connection.setDoInput(true);
			if (this.timeout > 0) {
				connection.setConnectTimeout(this.timeout);
				connection.setReadTimeout(this.timeout);
			}
			connection.setFixedLengthStreamingMode(data.length);
			OutputStream out = connection.getOutputStream();
			try {
				out.write(data);
			} finally {
				out.close();
			}
			int code = connection.getResponseCode();
			if (code == 200) {
				InputStream in = null;
				byte[] resData = null;
				try {
					in = connection.getInputStream();
					resData = IoUtil.readStream(in, false);
				} catch (IOException e) {
					log.error("Error read http response stream,url:" + url, e);
					throw new IOException("Error read http response stream");
				} finally {
					if (null != in)
						IoUtil.close(in);
				}
				try {
					return JsonService.fromJson(new String(resData, ConstData.UTF8), RES_TYPE);
				} catch (Exception e) {
					log.error("invalid response data,url:" + url, e);
					throw new IOException("invalid response data", e);
				}
			}
			log.error("Error http reponse status:" + code + ",url:" + url);
			throw new IOException("Error http reponse status:" + code);
		} finally {
			connection.disconnect();
		}
	}
	@Path("/bindAlias")
	@Post
	public boolean bindAlias(String alias, String cid) {
		String url = "https://restapi.getui.com/v1/" + this.appId + "/bind_alias";
		StringBuilder sb = new StringBuilder();
		sb.append("{\"alias_list\" : [{\"cid\":\"").append(cid).append("\",\"alias\":\"").append(alias).append("\" }]}");
		try {
			Map<String, Object> ret = post(url, TOKEN_MAP, sb.toString().getBytes(ConstData.UTF8));
			this.checkResult(ret);
			return true;
		} catch (IOException e) {
			log.error("bind alias error[cid:" + cid + ",alias:" + alias + "]", e);
			return false;
		}
	}
	
	@Path("/bindTags")
	@Post
	public boolean bindTags(String[] tags, String cid) {
		String url = "https://restapi.getui.com/v1/" + this.appId + "/set_tags";
		Map<String,Object> msg = new HashMap<String,Object>();
		msg.put("cid",cid);
		msg.put("tag_list",tags);
		try {
			Map<String, Object> ret = post(url, TOKEN_MAP, JsonService.toJson(msg).getBytes(ConstData.UTF8));
			this.checkResult(ret);
			return true;
		} catch (IOException e) {
			log.error("bind tags error:"+JsonService.toJson(msg), e);
			return false;
		}
	}
	@Path("/applyBadge")
	@Get
	public void applyBadge(int badge,String cid,String devtoken){
		String url = "https://restapi.getui.com/v1/" + this.appId + "/set_badge";
		StringBuilder sb = new StringBuilder();
		sb.append("{\"badge\":").append(badge).append(",\"cid_list\":[\"").append(cid).append("\"],\"devicetoken_list\":[\"").append(devtoken).append("\"]}");
		System.out.println(sb.toString());
		try {
			Map<String, Object> ret = post(url, TOKEN_MAP, sb.toString().getBytes(ConstData.UTF8));
			this.checkResult(ret);
		} catch (IOException e) {
			log.error("apply badge error[cid:" + cid + ",devtoken:" + devtoken + "]", e);
		}
		
	}
	
	private  Map<String,Object > createIosMessage(String title,String content,String payload){
		Map<String,Object> ret = new HashMap<String,Object>();
		Map<String,Object> message= new HashMap<String,Object>();
		ret.put("message", message);
		message.put("appkey",this.appKey);
		message.put("is_offline",true);
		message.put("msgtype", "transmission");
		Map<String,Object> transmission = new HashMap<String,Object>();
		ret.put("transmission", transmission);
		transmission.put("transmission_type", false);
		transmission.put("transmission_content", payload);
		Map<String,Object> pushInfo = new HashMap<String,Object>();
		ret.put("push_info", pushInfo);
		Map<String,Object> aps = new HashMap<String,Object>();
		pushInfo.put("aps",aps);
		Map<String,Object> alert = new HashMap<String,Object>();
		aps.put("alert", alert);
		alert.put("title", title);
		alert.put("body",content);
		aps.put("autoBadge","+1");
		aps.put("content-available",1);
		aps.put("sound","default");
		pushInfo.put("payload",payload);		
		ret.put("condition", onlyIos);
		return ret;		
	}
	
	private  Map<String,Object > createAndriodMessage(String title,String content,String payload){
		Map<String,Object> ret = new HashMap<String,Object>();
		Message message = new Message();
		ret.put("message", message);
		message.setAppKey(this.appKey);
		message.setMsgtype("notification");
		message.setOffline(true);
		message.setOfflineExpireTime(2*60*1000);
		message.setPushNetworkType(0);
		NotificationMessage notification = new NotificationMessage();
		ret.put("notification", notification);
	    notification.setTransmissionType(true);
	    notification.setTransmissionContent(payload);
	    MsgStyle style = new MsgStyle();
	    notification.setStyle(style);		
		style.setType(0);
		style.setClearable(true);
		style.setRing(true);
		style.setText(content);
		style.setTitle(title);
		style.setVibrate(true);
		ret.put("condition", onlyAndroid);
		return ret;		
	}
	
	public void toApp(String title,String content,Object payload){
		String url = "https://restapi.getui.com/v1/"+this.appId+"/push_app";
		String pl_str = JsonService.toJson(payload);
		Map<String,Object> andriodMessage = this.createAndriodMessage(title, content, pl_str);
		Map<String,Object> iosMessage = this.createIosMessage(title, content, pl_str);
		andriodMessage.put("requestid",this.allocateRequesstId());
		iosMessage.put("requestid",this.allocateRequesstId());		
		
//		System.out.println(JsonService.toJson(andriodMessage));
//		System.out.println(JsonService.toJson(iosMessage));
		try {
			Map<String,Object> ret = post(url, TOKEN_MAP,JsonService.toJson(andriodMessage).getBytes(ConstData.UTF8));
			this.checkResult(ret);
		} catch (Exception e) {
			log.error("send app message error",e);
		}
		try {
			Map<String,Object> ret = post(url, TOKEN_MAP,JsonService.toJson(iosMessage).getBytes(ConstData.UTF8));
			this.checkResult(ret);
		} catch (Exception e) {
			log.error("send app message error",e);
		}
	}
	private MsgCondition createTagCondition(String[] tags){
		return new MsgCondition("tag", tags, 0);
	}
	private void addTag(Map<String,Object> msg,MsgCondition  tagCondition){
		MsgCondition[] mcs = (MsgCondition[]) msg.get("condition");
		MsgCondition[] mcsn = new MsgCondition[mcs.length+1];
		System.arraycopy(mcs,0,mcsn, 0,mcs.length);
		mcsn[mcs.length] = tagCondition;
		msg.put("condition", mcsn);
		
	}
	
	public void pushWithTag(String title,String content,Object payload,String[] tags){
		String url = "https://restapi.getui.com/v1/"+this.appId+"/push_app";
		String pl_str = JsonService.toJson(payload);
		Map<String,Object> andriodMessage = this.createAndriodMessage(title, content, pl_str);
		Map<String,Object> iosMessage = this.createIosMessage(title, content, pl_str);
		andriodMessage.put("requestid",this.allocateRequesstId());
		iosMessage.put("requestid",this.allocateRequesstId());	
		
		MsgCondition tagC = this.createTagCondition(tags);
		addTag(andriodMessage, tagC);
		addTag(iosMessage, tagC);
		try {
			Map<String,Object> ret = post(url, TOKEN_MAP,JsonService.toJson(andriodMessage).getBytes(ConstData.UTF8));
			this.checkResult(ret);
		} catch (Exception e) {
			log.error("send app message error",e);
		}
		try {
			Map<String,Object> ret = post(url, TOKEN_MAP,JsonService.toJson(iosMessage).getBytes(ConstData.UTF8));
			this.checkResult(ret);
		} catch (Exception e) {
			log.error("send app message error",e);
		}
	}
	public void pushWithCid(String title,String content,Object payload,String cid){
		String url = "https://restapi.getui.com/v1/"+this.appId+"/push_single";
		String pl_str = JsonService.toJson(payload);
		Map<String,Object> androidMessage = this.createAndriodMessage(title, content, pl_str);
		Map<String,Object> iosMessage = this.createIosMessage(title, content, pl_str);
		androidMessage.put("requestid",this.allocateRequesstId());
		androidMessage.put("cid",cid);
		iosMessage.put("requestid",this.allocateRequesstId());		
		iosMessage.put("cid",cid);
		
//		System.out.println(JsonService.toJson(androidMessage));
//		System.out.println(JsonService.toJson(iosMessage));
		try {
			Map<String,Object> ret = post(url, TOKEN_MAP,JsonService.toJson(androidMessage).getBytes(ConstData.UTF8));
			this.checkResult(ret);
		} catch (Exception e) {
			log.error("send app message error",e);
		}
		try {
			Map<String,Object> ret = post(url, TOKEN_MAP,JsonService.toJson(iosMessage).getBytes(ConstData.UTF8));
			this.checkResult(ret);
		} catch (Exception e) {
			log.error("send app message error",e);
		}	
	}
	public void pushWithAlias(String title,String content,Object payload,String alias){
		String url = "https://restapi.getui.com/v1/"+this.appId+"/push_single";
		String pl_str = JsonService.toJson(payload);
		Map<String,Object> androidMessage = this.createAndriodMessage(title, content, pl_str);
		Map<String,Object> iosMessage = this.createIosMessage(title, content, pl_str);
		androidMessage.put("requestid",this.allocateRequesstId());
		androidMessage.put("alias",alias);
		iosMessage.put("requestid",this.allocateRequesstId());		
		iosMessage.put("alias",alias);
		
//		System.out.println(JsonService.toJson(androidMessage));
//		System.out.println(JsonService.toJson(iosMessage));
		try {
			Map<String,Object> ret = post(url, TOKEN_MAP,JsonService.toJson(androidMessage).getBytes(ConstData.UTF8));
			this.checkResult(ret);
		} catch (Exception e) {
			log.error("send app message error",e);
		}
		try {
			Map<String,Object> ret = post(url, TOKEN_MAP,JsonService.toJson(iosMessage).getBytes(ConstData.UTF8));
			this.checkResult(ret);
		} catch (Exception e) {
			log.error("send app message error",e);
		}	
	}
	
	
	
	public static HttpURLConnection getConnection(String urlString) throws IOException {
		URL url = new URL(urlString);
		HttpURLConnection conn = null;
		conn = (HttpURLConnection) url.openConnection();
		String protocal = url.getProtocol();
		if ((protocal != null) && (protocal.equalsIgnoreCase("https"))) {
			try {
				HttpsURLConnection httpsConn = (HttpsURLConnection) conn;
				httpsConn.setSSLSocketFactory(getTrustAllSSLContext().getSocketFactory());
				HostnameVerifier hv = new HostnameVerifier() {
					public boolean verify(String arg0, SSLSession arg1) {
						return true;
					}
				};
				httpsConn.setHostnameVerifier(hv);
			} catch (Exception e) {
				log.warn("init httpmanager error", e);
				throw new RuntimeException("init httpmanager error", e);
			}
		}
		return conn;
	}
	public static SSLContext getTrustAllSSLContext() throws Exception {
		TrustManager[] trustAllCerts = new TrustManager[1];
		TrustManager trust = new CustomTrustManager();
		trustAllCerts[0] = trust;
		SSLContext sc = SSLContext.getInstance("SSL");
		sc.init(null, trustAllCerts, null);
		return sc;
	}
	static class CustomTrustManager implements TrustManager, X509TrustManager {
		public X509Certificate[] getAcceptedIssuers() {
			return null;
		}
		public boolean isServerTrusted(X509Certificate[] certs) {
			return true;
		}
		public boolean isClientTrusted(X509Certificate[] certs) {
			return true;
		}
		public void checkServerTrusted(X509Certificate[] certs, String authType) throws CertificateException {
		}
		public void checkClientTrusted(X509Certificate[] certs, String authType) throws CertificateException {
		}
	}
	static {
		CONTENT_TYPE.put("Content-Type", "application/json");
		TOKEN_MAP.putAll(CONTENT_TYPE);
		TOKEN_MAP.put("authtoken", "ef60d2aa2bc3193fc99a99ef43906cee70658156dfb41156acc35f7e7b7fb3dd");
		ERR_MAP.put("no_msg", "没有消息体");
		ERR_MAP.put("alias_error", "找不到别名");
		ERR_MAP.put("black_ip", "黑名单ip");
		ERR_MAP.put("sign_error", "鉴权失败");
		ERR_MAP.put("pushnum_overlimit", "推送次数超限");
		ERR_MAP.put("no_appid", "找不到appid");
		ERR_MAP.put("no_user", "找不到对应用户");
		ERR_MAP.put("too_frequent", "推送过于频繁");
		ERR_MAP.put("sensitive_word", "有敏感词出现");
		ERR_MAP.put("appid_notmatch", "appid与cid或者appkey不匹配");
		ERR_MAP.put("not_auth", "用户没有鉴权");
		ERR_MAP.put("black_appid", "黑名单app");
		ERR_MAP.put("invalid_param", "参数检验不通过");
		ERR_MAP.put("alias_notbind", "别名没有绑定cid");
		ERR_MAP.put("tag_over_limit", "tag个数超限");
		ERR_MAP.put("successed_online", "在线下发");
		ERR_MAP.put("successed_offline", "离线下发");
		ERR_MAP.put("taginvalid_or_noauth", "tag无效或者没有使用权限");
		ERR_MAP.put("no_valid_push", "没有有效下发");
		ERR_MAP.put("successed_ignore", "忽略非活跃用户");
		ERR_MAP.put("no_taskid", "找不到taskid");
	}
	public static void main(String[] args) throws Exception {
		PushService s = new PushService();
//		 s.buildToken();
//		 s.checkToken();
//		TOKEN_MAP.put("authtoken", "ef60d2aa2bc3193fc99a99ef43906cee70658156dfb41156acc35f7e7b7fb3dd");
	long l = System.currentTimeMillis();
		s.toApp("title_" + l, "content_" + l, "payload_" + l);
//	s.applyBadge(1, "f293af1f1cc043185ee9d921b63c4807", "D380AD6865B61F4D179DBB208EE3C7268A672AB9821385050596608A186F6023");
		// for(int i = 0 ;i < 100;++i){
		// UUID uuid= UUID.randomUUID();
		// System.out.println( "A"+Long.toString(
		// uuid.getLeastSignificantBits(),36)+"_"+Long.toString(uuid.getMostSignificantBits(),
		// 36));
		// }
	}
}

src/main/resources/database.sql

@@ -1348,3 +1348,183 @@ ALTER TABLE article_pro ADD PRIMARY KEY (article_id, professor_id);
update resource set resource_type='1';
-----begin version 1.9------------------------
ALTER TABLE organization ADD COLUMN addr  text COLLATE "zh_CN.utf8";
COMMENT ON COLUMN organization.addr IS '企为地址';
ALTER TABLE organization ADD COLUMN email  text;
COMMENT ON COLUMN organization.email IS '联系邮箱';
ALTER TABLE organization ADD COLUMN contact_num  text;
COMMENT ON COLUMN organization.contact_num IS '联系电话';
ALTER TABLE organization ADD COLUMN field_of_customer  text  COLLATE "zh_CN.utf8";
COMMENT ON COLUMN organization.field_of_customer IS '客户领域';
ALTER TABLE organization ADD COLUMN field_of_supplier  text  COLLATE "zh_CN.utf8";
COMMENT ON COLUMN organization.field_of_supplier IS '供应商领域';
ALTER TABLE organization ADD COLUMN sort_num  int8 default 0 not null;
COMMENT ON COLUMN organization.sort_num IS '排序值';
ALTER TABLE organization ADD COLUMN page_views  int8 default 0 not null;
COMMENT ON COLUMN organization.page_views IS '浏览量';
COMMENT ON COLUMN watch.watch_type IS '关注类型(专家-1，资源-2，3-文章,4-专利 ，5-论文,6-企业)';
CREATE TABLE ppatent (
id char(32)  NOT NULL,
name text COLLATE "zh_CN.utf8" NOT NULL,
page_views int8 DEFAULT 0 NOT NULL,
code text  NOT NULL,
req_code text NOT NULL,
req_person text COLLATE "zh_CN.utf8",
req_day char(8) NOT NULL,
pub_day char(8) NOT NULL,
summary text COLLATE "zh_CN.utf8" NOT NULL,
ref_param text ,
authors text COLLATE "zh_CN.utf8" NOT NULL,
sort_num int8 DEFAULT 0 NOT NULL,
create_time char(14)  NOT NULL,
keywords text COLLATE "zh_CN.utf8"
);
COMMENT ON COLUMN ppatent.name IS '名称';
COMMENT ON COLUMN ppatent.page_views IS '浏览量';
COMMENT ON COLUMN ppatent.code IS '专利号';
COMMENT ON COLUMN ppatent.req_code IS '申请号';
COMMENT ON COLUMN ppatent.req_person IS '申请人';
COMMENT ON COLUMN ppatent.summary IS '摘要';
COMMENT ON COLUMN ppatent.keywords IS '关键词';
COMMENT ON COLUMN ppatent.authors IS '作者列表，以英文逗号分隔';
COMMENT ON COLUMN ppatent.sort_num IS '排序字段，人工权重';
CREATE UNIQUE INDEX ppatent_pkey ON ppatent USING btree (id);
ALTER TABLE ppatent ADD PRIMARY KEY (id);
CREATE TABLE patent_author (
patent_id char(32) NOT NULL,
professor_id char(32) DEFAULT '################################'::bpchar NOT NULL,
name text COLLATE "zh_CN.utf8" NOT NULL,
ass_time char(14) DEFAULT '00010101010101'::bpchar NOT NULL);
COMMENT ON COLUMN patent_author.patent_id IS '专利ID';
COMMENT ON COLUMN patent_author.professor_id IS '专家id(=32个#时，还没有关专家)';
COMMENT ON COLUMN patent_author.name IS '作者姓名';
COMMENT ON COLUMN patent_author.ass_time IS '关联专家时间';
CREATE UNIQUE INDEX patent_author_pkey ON patent_author USING btree (patent_id,name COLLATE "zh_CN.utf8");
ALTER TABLE patent_author ADD PRIMARY KEY (patent_id,name);
CREATE TABLE ppaper (
id char(32)  NOT NULL,
name text COLLATE "zh_CN.utf8" NOT NULL,
page_views int8 DEFAULT 0 NOT NULL,
cn4periodical text,
en4periodical text,
periodicaltype text,
pub_day text,
summary text COLLATE "zh_CN.utf8" NOT NULL,
keywords text COLLATE "zh_CN.utf8",
authors text COLLATE "zh_CN.utf8" NOT NULL,
sort_num int8 DEFAULT 0 NOT NULL,
create_time char(14) NOT NULL,
ref_param text);
COMMENT ON COLUMN ppaper.name IS '名称';
COMMENT ON COLUMN ppaper.page_views IS '浏览量';
COMMENT ON COLUMN ppaper.cn4periodical IS '期刊中文名';
COMMENT ON COLUMN ppaper.en4periodical IS '期刊英文名';
COMMENT ON COLUMN ppaper.pub_day IS '发表期数';
COMMENT ON COLUMN ppaper.summary IS '摘要';
COMMENT ON COLUMN ppaper.keywords IS '关键词';
COMMENT ON COLUMN ppaper.authors IS '作者列表，以英文逗号分隔';
COMMENT ON COLUMN ppaper.sort_num IS '排序字段，人工权重';
CREATE UNIQUE INDEX ppaper_pkey ON ppaper USING btree (id);
ALTER TABLE ppaper ADD PRIMARY KEY (id);
CREATE TABLE paper_author (
paper_id char(32) NOT NULL,
professor_id char(32) DEFAULT '################################'::bpchar NOT NULL,
name text COLLATE "zh_CN.utf8" NOT NULL,
ass_time char(14) DEFAULT '00010101010101'::bpchar NOT NULL);
COMMENT ON COLUMN paper_author.paper_id IS '专利ID';
COMMENT ON COLUMN paper_author.professor_id IS '专家id(=32个#时，还没有关专家)';
COMMENT ON COLUMN paper_author.name IS '作者姓名';
COMMENT ON COLUMN paper_author.ass_time IS '关联专家时间';
CREATE UNIQUE INDEX paper_author_pkey ON paper_author USING btree (paper_id,name COLLATE "zh_CN.utf8");
ALTER TABLE paper_author ADD PRIMARY KEY (paper_id,name);
CREATE TABLE ORG_REG_INFO (
NAME TEXT  COLLATE "zh_CN.utf8" NOT NULL,
NUM TEXT NOT NULL,
CODE TEXT NOT NULL,
CREDIT_CODE TEXT,
"TYPE" TEXT NOT NULL,
INDUSTRY TEXT NOT NULL,
OPERATING_PERIOD TEXT NOT NULL,
DAY_OF_APPROVAL TEXT NOT NULL,
MANAGER TEXT NOT NULL,
ADDR TEXT NOT NULL,
SCOPE_OF_BUSINESS TEXT NOT NULL);
ALTER TABLE ORG_REG_INFO ADD PRIMARY KEY (CODE);
COMMENT ON COLUMN ORG_REG_INFO.NAME IS '注册名称';
COMMENT ON COLUMN ORG_REG_INFO.NUM IS '工商注册号';
COMMENT ON COLUMN ORG_REG_INFO.CODE IS '组织机构代码';
COMMENT ON COLUMN ORG_REG_INFO.CREDIT_CODE IS '统一信用代码';
COMMENT ON COLUMN ORG_REG_INFO."TYPE" IS '企业类型';
COMMENT ON COLUMN ORG_REG_INFO.INDUSTRY IS '行业';
COMMENT ON COLUMN ORG_REG_INFO.OPERATING_PERIOD IS '营业期限';
COMMENT ON COLUMN ORG_REG_INFO.DAY_OF_APPROVAL IS '核准日期';
COMMENT ON COLUMN ORG_REG_INFO.MANAGER IS '登记机关';
COMMENT ON COLUMN ORG_REG_INFO.ADDR IS '注册地址';
COMMENT ON COLUMN ORG_REG_INFO.SCOPE_OF_BUSINESS IS '经营范围';
CREATE TABLE feedback (
id bigserial NOT NULL,
title text,
category int4 NOT NULL,
"schema" int4 NOT NULL,
param text NOT NULL,
content text NOT NULL,
create_time char(14) NOT NULL,
state char(1) NOT NULL,
user_id text,
PRIMARY KEY (id)
);
COMMENT ON TABLE feedback IS '反馈信息';
COMMENT ON COLUMN feedback.id IS '反馈信息ID';
COMMENT ON COLUMN feedback.title IS '标题';
COMMENT ON COLUMN feedback.category IS '大类  1：纠错';
COMMENT ON COLUMN feedback."schema" IS '小类  1：论文，2：专利, 3 专家 4 机构 5 资源 6 文章';
COMMENT ON COLUMN feedback.content IS '内容';
COMMENT ON COLUMN feedback.param IS '参数：如 论文ID....';
COMMENT ON COLUMN feedback.state IS '状态，0：初始状态   ，其他由不同大类业务确定';
COMMENT ON COLUMN feedback.user_id IS '返馈人ID';
create sequence professor_share_id_seq increment by 1 minvalue 100000 no maxvalue start with 100000;     
ALTER TABLE professor ADD COLUMN share_id int8 DEFAULT nextval('professor_share_id_seq'::regclass) NOT NULL;
COMMENT ON COLUMN professor.share_id IS '共享ID';
create sequence organization_share_id_seq increment by 1 minvalue 100000 no maxvalue start with 100000;     
ALTER TABLE organization ADD COLUMN share_id int8 DEFAULT nextval('organization_share_id_seq'::regclass) NOT NULL;
COMMENT ON COLUMN organization.share_id IS '共享ID';
create sequence article_share_id_seq increment by 1 minvalue 100000 no maxvalue start with 100000;     
ALTER TABLE article ADD COLUMN share_id int8 DEFAULT nextval('article_share_id_seq'::regclass) NOT NULL;
COMMENT ON COLUMN article.share_id IS '共享ID';
create sequence resource_share_id_seq increment by 1 minvalue 100000 no maxvalue start with 100000;     
ALTER TABLE resource ADD COLUMN share_id int8 DEFAULT nextval('resource_share_id_seq'::regclass) NOT NULL;
COMMENT ON COLUMN resource.share_id IS '共享ID';
create sequence ppaper_share_id_seq increment by 1 minvalue 100000 no maxvalue start with 100000;     
ALTER TABLE ppaper ADD COLUMN share_id int8 DEFAULT nextval('ppaper_share_id_seq'::regclass) NOT NULL;
COMMENT ON COLUMN ppaper.share_id IS '共享ID';
create sequence ppatent_share_id_seq increment by 1 minvalue 100000 no maxvalue start with 100000;     
ALTER TABLE ppatent ADD COLUMN share_id int8 DEFAULT nextval('ppatent_share_id_seq'::regclass) NOT NULL;
COMMENT ON COLUMN ppatent.share_id IS '共享ID';
update organization set org_type = null;
ALTER TABLE  organization ADD COLUMN linkman text;
COMMENT ON COLUMN  organization.linkman IS '联系人';