11

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

@@ -0,0 +1,53 @@
package com.ekexiu.portal.found;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.SQLException;
import java.util.List;
import java.util.Map;
import org.jfw.apt.annotation.DefaultValue;
import org.jfw.apt.web.annotation.Path;
import org.jfw.apt.web.annotation.operate.Get;
import org.jfw.apt.web.annotation.param.JdbcConn;
import org.jfw.util.jdbc.JdbcUtil;
import org.jfw.util.jdbc.PreparedStatementConfig;
@Path("/found")
public class Service {
/**
 * 查询新发现（含提问）
 * @param con
 * @param time 下拉加载上一次返回的最后一条数据的tm,首次不传
 * @param id 下拉加载上一次返回的最后一条数据的id,首次不传
 * @param rows 下拉加载返回的数据条数，默认20
 * @param ex 排除的文章ID
 * @return [{ctype:"1:专家文章，2：企业文章  3， 提问"
 *                 id:"文章id 或  提问ID ",
 *                 uid:"专家ID 或 企业id 或 提问人ID ",
 *                 tm:"文章发布时间 或 提问时间，
 *                 num:0 ,//提问回答数
 *                 img:"图片",
 *                 col:0,//文章栏目
 *                  }....]
 * @throws SQLException
 */
	@Get
	@Path("/index")
	public List<Map<String,Object>> query(@JdbcConn Connection con,@DefaultValue("\"9\"") final String time,@DefaultValue("\"0\"") final String id,@DefaultValue("20") final int rows,final String ex)throws SQLException{
		return JdbcUtil.queryMaps(con, "SELECT * FROM 	( "+
		"SELECT ID id,'3' ctype,uid uid,title title,	last_reply_time tm,reply_count num,img img,null col	FROM question where state='1' UNION ALL "+
		"SELECT ARTICLE_ID id,	'1' ctype,professor_id uid,article_title title,publish_time tm,	0 num,article_img img,col_num col FROM article WHERE status = '1' AND article_type = '1' AND article_id <>? UNION ALL "+
		"SELECT ARTICLE_ID id,	'2' ctype,org_id uid,article_title title,publish_time tm,0 num,article_img img,col_num col FROM article WHERE status = '1' AND article_type = '2' AND article_id <>? 	) T "+
        "WHERE T.tm <= ? AND T.id > ? ORDER BY tm DESC LIMIT ?", new PreparedStatementConfig() {
			@Override
			public void config(PreparedStatement ps) throws SQLException {
				ps.setString(1,ex);
				ps.setString(2, ex);
				ps.setString(3, time);
				ps.setString(4, id);
				ps.setInt(5,rows);
			}
		});
	}
}

src/main/java/com/ekexiu/portal/leavemsg/LeaveMsg.java

@@ -23,7 +23,7 @@ public class LeaveMsg implements CreateTimeSupported,ModifyTimeSupported {
	private String createTime;
	private String modifyTime;
	private String state;
	private long  acceptCount;
	private long  agreeCount;
	
	/**
	 * id
@@ -59,7 +59,7 @@ public class LeaveMsg implements CreateTimeSupported,ModifyTimeSupported {
		this.refId = refId;
	}
	/**
	 * 留言主体类型,1:文章   2:论文   3:专利      4:提问
	 * 留言主体类型,1:文章   2:论文   3:专利      4:回答
	 * @return
	 */
	@Column(DE.singleChar)
@@ -141,10 +141,10 @@ public class LeaveMsg implements CreateTimeSupported,ModifyTimeSupported {
	 * @return
	 */
	@Column(DE.long_de)
	public long getAcceptCount() {
		return acceptCount;
	public long getAgreeCount() {
		return agreeCount;
	}
	public void setAcceptCount(long acceptCount) {
		this.acceptCount = acceptCount;
	public void setAgreeCount(long agreeCount) {
		this.agreeCount = agreeCount;
	}
}

src/main/java/com/ekexiu/portal/leavemsg/LeaveMsgApRec.java

@@ -9,7 +9,7 @@ import com.ekexiu.portal.basepo.CreateTimeSupported;
@Table
@PrimaryKey({"id","uid"})
public class LeaveMsgApRec  implements CreateTimeSupported{
public class LeaveMsgAgreeRec  implements CreateTimeSupported{
	private String id;
	private String uid;

src/main/java/com/ekexiu/portal/leavemsg/LeaveMsgDao.java

@@ -39,9 +39,9 @@ public interface LeaveMsgDao {
	@UpdateWith
	@From(LeaveMsg.class)
	@SetSentence("ACCEPT_COUNT = ACCEPT_COUNT + 1")
	@SetSentence("AGREE_COUNT = AGREE_COUNT + 1")
	@IncludeFixSet
	int incAccept(Connection con, String id) throws SQLException;
	int incAgree(Connection con, String id) throws SQLException;
	@LimitSelect
	@Where("STATE='1'")
@@ -53,11 +53,11 @@ public interface LeaveMsgDao {
	LeaveMsg query(Connection con, String id) throws SQLException;
	@Insert
	int insert(Connection con, LeaveMsgApRec rec) throws SQLException;
	int insert(Connection con, LeaveMsgAgreeRec rec) throws SQLException;
	@Nullable
	@SelectOne
	LeaveMsgApRec queryAcceptRec(Connection con, String id, String uid) throws SQLException;
	LeaveMsgAgreeRec queryAgreeRec(Connection con, String id, String uid) throws SQLException;
	@LimitSelect
	@OrderBy("ORDER BY GREATE_TIME ASC,ID ASC")

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

@@ -21,11 +21,101 @@ import org.jfw.util.exception.JfwBaseException;
import org.jfw.util.jdbc.JdbcUtil;
import org.jfw.util.jdbc.PreparedStatementConfig;
import com.ekexiu.portal.dao.ArticleDao;
import com.ekexiu.portal.dao.PaperAuthorDao;
import com.ekexiu.portal.dao.PatentAuthorDao;
import com.ekexiu.portal.dao.PpaperDao;
import com.ekexiu.portal.dao.PpatentDao;
import com.ekexiu.portal.notify.NotifyService;
import com.ekexiu.portal.notify.NotifyType;
import com.ekexiu.portal.po.Article;
import com.ekexiu.portal.po.PaperAuthor;
import com.ekexiu.portal.po.PatentAuthor;
import com.ekexiu.portal.po.Ppaper;
import com.ekexiu.portal.po.Ppatent;
import com.ekexiu.portal.question.Answer;
import com.ekexiu.portal.question.Question;
import com.ekexiu.portal.question.QuestionDao;
@Path("/leavemsg")
public class Service {
	@Autowrie
	private LeaveMsgDao leaveMsgDao;
	@Autowrie
	private ArticleDao articleDao;
	@Autowrie
	private PpatentDao ppatentDao;
	@Autowrie
	private PpaperDao ppaperDao;
	@Autowrie
	private QuestionDao questionDao;
	@Autowrie
	private NotifyService notifyService;
	@Autowrie
	private PaperAuthorDao paperAuthorDao;
	@Autowrie
	private PatentAuthorDao patentAuthorDao;
	public PaperAuthorDao getPaperAuthorDao() {
		return paperAuthorDao;
	}
	public void setPaperAuthorDao(PaperAuthorDao paperAuthorDao) {
		this.paperAuthorDao = paperAuthorDao;
	}
	public PatentAuthorDao getPatentAuthorDao() {
		return patentAuthorDao;
	}
	public void setPatentAuthorDao(PatentAuthorDao patentAuthorDao) {
		this.patentAuthorDao = patentAuthorDao;
	}
	public ArticleDao getArticleDao() {
		return articleDao;
	}
	public void setArticleDao(ArticleDao articleDao) {
		this.articleDao = articleDao;
	}
	public PpatentDao getPpatentDao() {
		return ppatentDao;
	}
	public void setPpatentDao(PpatentDao ppatentDao) {
		this.ppatentDao = ppatentDao;
	}
	public PpaperDao getPpaperDao() {
		return ppaperDao;
	}
	public void setPpaperDao(PpaperDao ppaperDao) {
		this.ppaperDao = ppaperDao;
	}
	public QuestionDao getQuestionDao() {
		return questionDao;
	}
	public void setQuestionDao(QuestionDao questionDao) {
		this.questionDao = questionDao;
	}
	public NotifyService getNotifyService() {
		return notifyService;
	}
	public void setNotifyService(NotifyService notifyService) {
		this.notifyService = notifyService;
	}
	public LeaveMsgDao getLeaveMsgDao() {
		return leaveMsgDao;
	}
@@ -34,8 +124,67 @@ public class Service {
		this.leaveMsgDao = leaveMsgDao;
	}
	public String getSubjectTitle(Connection con, String type, String id) throws SQLException {
		return null;
	// 1:文章 2:论文 3:专利 4:回答
	public void notify(Connection con, String type, String id, String reciver, String uid, String uname, String lid,boolean agree, List<Runnable> runs)
			throws SQLException, JfwBaseException {
		if (type.equals("1")) {
			Article article = this.articleDao.queryOne(con, id);
			if (article == null) {
				throw new JfwBaseException(50000, "article[" + id + "] not found");
			}
			if (article.getArticleType().equals("1")) {
				if (reciver == null) {
					this.notifyService.notify(con, article.getProfessorId(), uid, uname, lid, article.getArticleTitle(), NotifyType.LEAVE_MSG_AT_ARTICLE, runs);
				} else {
					this.notifyService.notify(con, reciver, uid, uname, lid, article.getArticleTitle(),agree?NotifyType.AGREE_LEAVE_MSG_AT_ARTICLE: NotifyType.REPLY_LEAVE_MSG_AT_ARTICLE, runs);
				}
			}
		} else if (type.equals("2")) {
			Ppaper paper = this.ppaperDao.query(con, id);
			if (paper == null) {
				throw new JfwBaseException(50000, "paper[" + id + "] not found");
			}
			if (reciver == null) {
				for (PaperAuthor pa : this.paperAuthorDao.query(con, id)) {
					if (!pa.getProfessorId().startsWith("#")) {
						this.notifyService.notify(con, pa.getProfessorId(), uid, uname, lid, paper.getName(), NotifyType.LEAVE_MSG_AT_PAPER, runs);
					}
				}
			} else {
				this.notifyService.notify(con, reciver, uid, uname, lid, paper.getName(),agree?NotifyType.AGREE_LEAVE_MSG_AT_PAPER: NotifyType.REPLY_LEAVE_MSG_AT_PAPER, runs);
			}
		} else if (type.equals("3")) {
			Ppatent patent = this.ppatentDao.query(con, id);
			if (patent == null) {
				throw new JfwBaseException(50000, "patent[" + id + "] not found");
			}
			if (reciver == null) {
				for (PatentAuthor pa : this.patentAuthorDao.query(con, id)) {
					if (!pa.getProfessorId().startsWith("#")) {
						this.notifyService.notify(con, pa.getProfessorId(), uid, uname, lid, patent.getName(), NotifyType.LEAVE_MSG_AT_PARENT, runs);
					}
				}
			} else {
				this.notifyService.notify(con, reciver, uid, uname, lid, patent.getName(),agree?NotifyType.AGREE_LEAVE_MSG_AT_PARENT: NotifyType.REPLY_LEAVE_MSG_AT_PARENT, runs);
			}
		} else if (type.equals("4")) {
			Answer a = this.questionDao.queryAnswer(con, id);
			if(a ==null){
				throw new JfwBaseException(50000, "answer[" + id + "] not found");
			}
			Question q = this.questionDao.query(con, a.getQid());
			if (q == null) {
				throw new JfwBaseException(50000, "answer[" + id + "]'question not found");
			}
			if (reciver == null) {
				this.notifyService.notify(con,a.getUid(), uid, uname, lid, q.getTitle(), NotifyType.LEAVE_MSG_AT_ANSWER, runs);
			} else {
				this.notifyService.notify(con, reciver, uid, uname, lid, q.getTitle(),agree?NotifyType.AGREE_LEAVE_MSG_AT_ANSWER: NotifyType.REPLY_LEAVE_MSG_AT_ANSWER, runs);
			}
		} else {
			throw new IllegalArgumentException();
		}
	}
	/**
@@ -51,27 +200,22 @@ public class Service {
	 * @param runs
	 * @return
	 * @throws SQLException
	 * @throws JfwBaseException
	 */
	@Path()
	@Post
	public String save(@JdbcConn(true) Connection con,
			@RequestParam(fields = { @FieldParam(value = "cnt", valueClass = String.class), @FieldParam(value = "refId", valueClass = String.class),
					@FieldParam(value = "refType", valueClass = String.class), @FieldParam(value = "sender", valueClass = String.class) }) LeaveMsg msg,
			String title, String uname, @AfterCommit List<Runnable> runs) throws SQLException {
			 String uname, @AfterCommit List<Runnable> runs) throws SQLException, JfwBaseException {
		String id = StringUtil.buildUUID();
		msg.setId(id);
		msg.setTop(id);
		msg.setState("1");
		msg.setParent(null);
		msg.setAcceptCount(0);
		runs.add(new Runnable() {
			@Override
			public void run() {
				// TODO: send notify
			}
		});
		msg.setAgreeCount(0);
		leaveMsgDao.insert(con, msg);
		this.notify(con, msg.getRefType(), msg.getRefId(), null, msg.getSender(), uname, id,false, runs);
		return id;
	}
@@ -96,7 +240,7 @@ public class Service {
	 */
	@Path("/reply")
	@Post
	public String reply(@JdbcConn(true) Connection con, String cnt, String id, String uid, @Nullable String title, String uname,
	public String reply(@JdbcConn(true) Connection con, String cnt, String id, String uid, String uname,
			@AfterCommit List<Runnable> runs) throws SQLException, JfwBaseException {
		final LeaveMsg msg = leaveMsgDao.query(con, id);
		if (msg == null)
@@ -111,20 +255,8 @@ public class Service {
		msg.setState("1");
		msg.setCnt(cnt);
		msg.setId(nid);
		msg.setAcceptCount(0);
		if (title == null) {
			title = this.getSubjectTitle(con, msg.getRefType(), msg.getRefId());
			if (title == null || title.isEmpty()) {
				title = "<<丢失的数据>>";
			}
		}
		runs.add(new Runnable() {
			@Override
			public void run() {
				// TODO: send notify
			}
		});
		leaveMsgDao.insert(con, msg);
		this.notify(con, msg.getRefType(), msg.getRefId(), msg.getReciver(), uid, uname, id,false, runs);
		return nid;
	}
@@ -209,14 +341,14 @@ public class Service {
	 * @throws JfwBaseException
	 */
	@Post
	@Path("/accept")
	public void accept(@JdbcConn(true) Connection con, String id, String uid, String uname, @AfterCommit List<Runnable> runs)
	@Path("/agree")
	public void agree(@JdbcConn(true) Connection con, String id, String uid, String uname, @AfterCommit List<Runnable> runs)
			throws SQLException, JfwBaseException {
		LeaveMsg msg = leaveMsgDao.query(con, id);
		if (msg == null) {
			throw new JfwBaseException(50000, "leave message[id:" + id + "] not found");
		}
		LeaveMsgApRec lmar = new LeaveMsgApRec();
		LeaveMsgAgreeRec lmar = new LeaveMsgAgreeRec();
		lmar.setId(id);
		lmar.setUid(uid);
		try {
@@ -224,17 +356,12 @@ public class Service {
		} catch (SQLException e) {
			if ("23505".equals(e.getSQLState())) {
				con.rollback();
				throw new JfwBaseException(50001, "leave message  duplicate accept");
				throw new JfwBaseException(50001, "leave message  duplicate agree");
			}
			throw e;
		}
		if (leaveMsgDao.incAccept(con, id) > 0) {
			runs.add(new Runnable() {
				@Override
				public void run() {
					// TODO: send notify
				}
			});
		if (leaveMsgDao.incAgree(con, id) > 0) {
			this.notify(con, msg.getRefType(), msg.getRefId(), msg.getSender(), uid, uname, msg.getId(), true, runs);
		}
	}
@@ -250,9 +377,9 @@ public class Service {
	 * @throws SQLException
	 */
	@Get
	@Path("/accept")
	public boolean accept(@JdbcConn Connection con, String id, String uid) throws SQLException {
		return null != leaveMsgDao.queryAcceptRec(con, id, uid);
	@Path("/agree")
	public boolean agree(@JdbcConn Connection con, String id, String uid) throws SQLException {
		return null != leaveMsgDao.queryAgreeRec(con, id, uid);
	}
	/**

src/main/java/com/ekexiu/portal/notify/NotifyMsgCnt.java

@@ -0,0 +1,78 @@
package com.ekexiu.portal.notify;
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;
@Table
@PrimaryKey("id")
public class NotifyMsgCnt{
	private String id;
	private String cnt;
	private String reciver;
	private boolean readed;
	private String pid;
	private String uid;
	private String createTime;
	private int opType;
	@Column(DE.id_32)
	public String getId() {
		return id;
	}
	public void setId(String id) {
		this.id = id;
	}
	@Column(DE.text_de)
	public String getCnt() {
		return cnt;
	}
	public void setCnt(String cnt) {
		this.cnt = cnt;
	}
	@Column(DE.text_de)
	public String getReciver() {
		return reciver;
	}
	public void setReciver(String reciver) {
		this.reciver = reciver;
	}
	@Column(DE.boolean_de)
	public boolean isReaded() {
		return readed;
	}
	public void setReaded(boolean readed) {
		this.readed = readed;
	}
	@Column(DE.text_de)
	public String getPid() {
		return pid;
	}
	public void setPid(String pid) {
		this.pid = pid;
	}
	@Column(DE.text_de)
	public String getUid() {
		return uid;
	}
	public void setUid(String uid) {
		this.uid = uid;
	}
	@Column(DE.text_de)
	public String getCreateTime() {
		return createTime;
	}
	public void setCreateTime(String createTime) {
		this.createTime = createTime;
	}
	@Column(DE.int_de)
	public int getOpType() {
		return opType;
	}
	public void setOpType(int opType) {
		this.opType = opType;
	}
	
}

src/main/java/com/ekexiu/portal/notify/NotifyMsgDao.java

@@ -0,0 +1,52 @@
package com.ekexiu.portal.notify;
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.OrderBy;
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.Insert;
import org.jfw.apt.orm.annotation.dao.method.operator.LimitSelect;
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.GreaterThan;
import org.jfw.apt.orm.annotation.dao.param.GtEq;
import org.jfw.apt.orm.annotation.dao.param.LtEq;
import org.jfw.apt.orm.annotation.dao.param.Set;
@DAO
public interface NotifyMsgDao {
	@Insert
	int insert(Connection con,NotifyMsgIdx msg)throws SQLException;
	@Insert
	int insert(Connection con,NotifyMsgCnt msg)throws SQLException;
	@UpdateWith
	@From(NotifyMsgIdx.class)
	@SetSentence("UN_READ = UN_READ +1")
	int updateIdx(Connection con,@Set String lastCnt,@Set String lastTime,String reciver ) throws SQLException;
	
	@UpdateWith
	@From(NotifyMsgIdx.class)
	int decUnRead(Connection con,String reciver, @Set(" = UN_READ - ?") int unRead ) throws SQLException;
	
	@SelectOne
	@Nullable
	NotifyMsgIdx queryIdx(Connection con,String reciver)throws SQLException;
	
	
	@LimitSelect
	@OrderBy("ORDER BY CREATE_TIME DESC,ID ASC")
	List<NotifyMsgCnt> queryCnt(Connection con,String reciver,@LtEq String createTime,@GreaterThan String id,int rows)throws SQLException;
	
	@UpdateWith
	@From(NotifyMsgCnt.class)
	@SetSentence("READED='1'")
	@Where("READED<>'1'")
	int readed(Connection con,String reciver ,@LtEq String createTime,@GtEq String id)throws SQLException; 
}

src/main/java/com/ekexiu/portal/notify/NotifyMsgIdx.java

@@ -0,0 +1,44 @@
package com.ekexiu.portal.notify;
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;
@Table
@PrimaryKey("reciver")
public class NotifyMsgIdx {
	private String reciver;
	private String lastCnt;
	private String lastTime;
	private int unRead;
	@Column(DE.text_de)
	public String getReciver() {
		return reciver;
	}
	public void setReciver(String reciver) {
		this.reciver = reciver;
	}
	@Column(DE.text_de)
	public String getLastCnt() {
		return lastCnt;
	}
	public void setLastCnt(String lastCnt) {
		this.lastCnt = lastCnt;
	}
	@Column(DE.text_de)
	public String getLastTime() {
		return lastTime;
	}
	public void setLastTime(String lastTime) {
		this.lastTime = lastTime;
	}
	@Column(DE.int_de)
	public int getUnRead() {
		return unRead;
	}
	public void setUnRead(int unRead) {
		this.unRead = unRead;
	}
	
}

src/main/java/com/ekexiu/portal/notify/NotifyService.java

@@ -0,0 +1,100 @@
package com.ekexiu.portal.notify;
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.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.DateUtil;
import org.jfw.util.StringUtil;
import org.jfw.util.json.JsonService;
import com.ekexiu.portal.util.WebMsgSocketServlet;
import com.ekexiu.push.service.PushService;
@Path("/notify")
public class NotifyService {
	@Autowrie
	private NotifyMsgDao notifyMsgDao;
	@Autowrie
	private PushService pushService;
	public NotifyMsgDao getNotifyMsgDao() {
		return notifyMsgDao;
	}
	public void setNotifyMsgDao(NotifyMsgDao notifyMsgDao) {
		this.notifyMsgDao = notifyMsgDao;
	}
	public PushService getPushService() {
		return pushService;
	}
	public void setPushService(PushService pushService) {
		this.pushService = pushService;
	}
	public void notify(Connection con, final String rid, String uid, String uname, String pid, String pname, NotifyType type,List<Runnable> runs) throws SQLException {
		String time = DateUtil.formatDateTime(System.currentTimeMillis());
		String id = StringUtil.buildUUID();
		String tCnt = type.format(uname, pname);
		final NotifyMsgCnt cnt = new NotifyMsgCnt();
		cnt.setId(id);
		cnt.setCnt(tCnt);
		cnt.setCreateTime(time);
		cnt.setOpType(type.getType());
		cnt.setPid(pid);
		cnt.setReaded(false);
		cnt.setReciver(rid);
		cnt.setUid(uid);
		notifyMsgDao.insert(con, cnt);
		final NotifyMsgIdx idx = new NotifyMsgIdx();
		idx.setLastCnt(tCnt);
		idx.setLastTime(time);
		idx.setReciver(rid);
		idx.setUnRead(1);
		if (notifyMsgDao.updateIdx(con, tCnt, time, rid) < 1) {
			notifyMsgDao.insert(con, idx);
		}
		final Runnable ret = new Runnable() {
			public void run() {
				WebMsgSocketServlet.sendMessage(rid, JsonService.toJson(cnt));
				try {
					pushService.pushWithAlias("通知", "您收到了一条通知", "msgsend", rid);
				} catch (Throwable thr) {
				}
			}
		};
		runs.add(ret);
	}
	@Path("/idx")
	@Get
	public NotifyMsgIdx query(@JdbcConn Connection con, String id) throws SQLException {
		return notifyMsgDao.queryIdx(con, id);
	}
	@Path()
	@Get
	public List<NotifyMsgCnt> query(@JdbcConn Connection con, String uid, @DefaultValue("\"99999999999999\"") String time, @DefaultValue("\"0\"") String mid,
			@DefaultValue("20") int rows) throws SQLException {
		return notifyMsgDao.queryCnt(con, uid, time, mid, rows);
	}
	@Post
	@Path("/readed")
	public int read(@JdbcConn(true) Connection con,String uid,String time,String mid)throws SQLException{
		int num = this.notifyMsgDao.readed(con, uid,time, mid);
		if(num>0){
			this.notifyMsgDao.decUnRead(con, uid,num);
		}
		return num;
	}
}

src/main/java/com/ekexiu/portal/notify/NotifyType.java

@@ -0,0 +1,57 @@
package com.ekexiu.portal.notify;
public enum NotifyType {
	AGREE_LEAVE_MSG_AT_ANSWER("%s  点赞了您在回答 <span>%s</span> 下的留言",19, 2) ,
	AGREE_LEAVE_MSG_AT_PAPER("%s  点赞了您在论文 <span>%s</span> 下的留言",18, 2) ,
	AGREE_LEAVE_MSG_AT_PARENT("%s  点赞了您在专利 <span>%s</span> 下的留言",17, 2) ,
	AGREE_LEAVE_MSG_AT_ARTICLE("%s  点赞了您在文章 <span>%s</span> 下的留言",16, 2) ,
	REPLY_LEAVE_MSG_AT_ANSWER("%s  回复了您在回答 <span>%s</span> 下的留言",15, 2) ,
	REPLY_LEAVE_MSG_AT_PAPER("%s  回复了您在论文 <span>%s</span> 下的留言",14, 2) ,
	REPLY_LEAVE_MSG_AT_PARENT("%s  回复了您在专利 <span>%s</span> 下的留言",13, 2) ,
	REPLY_LEAVE_MSG_AT_ARTICLE("%s  回复了您在文章 <span>%s</span> 下的留言",12, 2) ,
	LEAVE_MSG_AT_ANSWER("%s  给您的回答 <span>%s</span> 留言了",11, 2) ,
	LEAVE_MSG_AT_PAPER("%s  给您的论文 <span>%s</span> 留言了",10, 2) ,
	LEAVE_MSG_AT_PARENT("%s  给您的专利 <span>%s</span> 留言了", 9, 2) ,
	LEAVE_MSG_AT_ARTICLE("%s  给您的文章 <span>%s</span> 留言了", 8, 2) ,
	AGREE_PAPER("%s 点赞了您的论文 <span>%s</span>", 7, 2) ,
	AGREE_PATENT("%s 点赞了您的专利 <span>%s</span>", 6, 2) ,
	INVITE_ANSWER("%s 邀请您回答问题 <span>%s</span>", 5, 2) ,
	ACCEPT_ANSWER("%s 点赞了您在问题 <span>%s</span> 下的回答", 4, 2) ,
	ANSWER_QUESTION("%s 回答了您的提问 <span>%s</span>", 3, 2) ,
	AGREE_ARTICLE("%s 点赞了您的文章 <span>%s</span>", 2, 2) ,
	AGREE_RESEARCH_AREA("%s 点赞了您的研究方向 <span>%s</span>", 1, 2) ,
	WATCH_USER("<span>%s</span> 关注了您", 0, 1);
	private String template;
	private int type;
	private int paramSize;
	NotifyType(String template, int type, int paramSize) {
		this.template = template;
		this.type = type;
		this.paramSize = paramSize;
	}
	public String getTemplate() {
		return template;
	}
	public int getType() {
		return type;
	}
	public String format(String user, String title) {
		return paramSize == 1 ? String.format(this.template, html(user)) : String.format(this.template, html(user), html(title));
	}
	private static String html(String html) {
		html = html.replaceAll("&", "&amp;");
		html = html.replace("\"", "&quot;"); // "
		html = html.replace("\t", "&nbsp;&nbsp;");// 替换跳格
		html = html.replace(" ", "&nbsp;");// 替换空格
		html = html.replace("<", "&lt;");
		html = html.replaceAll(">", "&gt;");
		return html;
	}
}

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

@@ -19,7 +19,7 @@ public class Answer  implements CreateTimeSupported,ModifyTimeSupported{
	private String state;
	private String cnt;
	
	private long accept;
	private long agree;
	private long  ballot;
	private String createTime;
	private String modifyTime;
@@ -82,11 +82,11 @@ public class Answer  implements CreateTimeSupported,ModifyTimeSupported{
	 * 点赞数量
	 */
	@Column(DE.long_de)
	public long getAccept() {
		return accept;
	public long getAgree() {
		return agree;
	}
	public void setAccept(long accept) {
		this.accept = accept;
	public void setAgree(long agree) {
		this.agree = agree;
	}
	/**
	 * 总数投票数

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

@@ -7,7 +7,7 @@ import org.jfw.apt.orm.core.enums.DE;
@PrimaryKey({"uid","aid"})
@Table
public class AnswerAcceptRec{
public class AnswerAgreeRec{
	private String uid;
	private String aid;

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

@@ -56,9 +56,18 @@ public interface QuestionDao {
	@SelectOne
	@Nullable
	Question query(Connection con, String id) throws SQLException;
	
	@SelectOne
	@Nullable
	Answer queryAnswer(Connection con,String id)throws SQLException;
	@SelectList
	List<Question> query(Connection con, @In String[] id) throws SQLException;
	
	@LimitSelect
	@OrderBy("ORDER BY CREATE_TIME DESC,ID ASC")
	@Where("QID IN(SELECT ID FROM QUESTION WHERE STATE='1') AND STATE='1'")
	List<Answer> answer(Connection con,@LtEq String createTime, @GreaterThan String id, int rows) throws SQLException;
	@LimitSelect
	@OrderBy("ORDER BY CREATE_TIME DESC,ID ASC")
@@ -78,24 +87,24 @@ public interface QuestionDao {
	List<Answer> byQes(Connection con, String qid, @LtEq String createTime, @GreaterThan String id, int rows) throws SQLException;
	@LimitQuery
	@OrderBy("ORDER BY SCORE DESC,ID ASC")
	List<SortedAnswwer> byQes(Connection con, String qid, @SqlColumn(handlerClass = IntHandler.class, value = { "10000 * ACCEPT / BALLOT <= ?  " }) int score, @GreaterThan String id, int rows) throws SQLException;
	List<SortedAnswwer> byQes(Connection con, String qid, @SqlColumn(handlerClass = IntHandler.class, value = { "10000 * AGREE / BALLOT <= ?  " }) int score, @GreaterThan String id, int rows) throws SQLException;
	@Insert
	int insert(Connection con,AnswerAcceptRec aar)throws SQLException;
	int insert(Connection con,AnswerAgreeRec aar)throws SQLException;
	@UpdateWith
	@From(AnswerAcceptRec.class)
	@From(AnswerAgreeRec.class)
	@Where("FLAG<>'1'")
	@SetSentence("FLAG='1'")
	int accept(Connection con,String uid,String aid)throws SQLException;
	int agree(Connection con,String uid,String aid)throws SQLException;
	@UpdateWith
	@From(AnswerAcceptRec.class)
	@From(AnswerAgreeRec.class)
	@Where("FLAG='1'")
	@SetSentence("FLAG='0'")
	int unAccept(Connection con,String uid,String aid)throws SQLException;
	int unAgree(Connection con,String uid,String aid)throws SQLException;
	
	@UpdateWith
	@From(Answer.class)
	int update(Connection con,String id, @Set( " = ACCEPT +?" ) long accept,@Set("=BALLOT+?") long ballot)throws SQLException;
	int update(Connection con,String id, @Set( " = AGREE +?" ) long agree,@Set("=BALLOT+?") long ballot)throws SQLException;
	
	
	@Insert

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

@@ -31,6 +31,8 @@ import org.jfw.util.jdbc.PreparedStatementConfig;
import org.jfw.util.web.fileupload.Item;
import org.jfw.util.web.fileupload.UploadItemIterator;
import com.ekexiu.portal.notify.NotifyService;
import com.ekexiu.portal.notify.NotifyType;
import com.ekexiu.portal.util.SqlUtil;
@Path("/question")
@@ -41,8 +43,19 @@ public class Service {
	@Autowrie
	private QuestionDao questionDao;
	@Autowrie
	private NotifyService notifyService;
	private File imgPath;
	public NotifyService getNotifyService() {
		return notifyService;
	}
	public void setNotifyService(NotifyService notifyService) {
		this.notifyService = notifyService;
	}
	public File getImgPath() {
		return imgPath;
	}
@@ -179,7 +192,7 @@ public class Service {
	 * 邀请专家回答提问
	 * 
	 * @param con
	 * @param id
	 * @param qid
	 *            提问id
	 * @param pid
	 *            专家id(被邀请人)
@@ -193,12 +206,12 @@ public class Service {
	 */
	@Post
	@Path("/invite")
	public boolean invite(@JdbcConn Connection con, String id, String pid, String uid, String uname) throws SQLException, JfwBaseException {
		Question q = questionDao.query(con, id);
	public boolean invite(@JdbcConn(true) Connection con, String qid, String pid, String uid, String uname,@AfterCommit List<Runnable> runs) throws SQLException, JfwBaseException {
		Question q = questionDao.query(con, qid);
		if (q == null) {
			throw new JfwBaseException(50000, "question[" + id + "] not found");
			throw new JfwBaseException(50000, "question[" +qid + "] not found");
		}
		// TODO: send notify
		this.notifyService.notify(con, pid, uid, uname, qid, q.getTitle(), NotifyType.INVITE_ANSWER, runs);
		return true;
	}
@@ -220,7 +233,8 @@ public class Service {
	 */
	@Post
	@Path("/answer")
	public String answer(@JdbcConn(true) Connection con, String qid, String cnt, String uid, String uname) throws SQLException, JfwBaseException {
	public String answer(@JdbcConn(true) Connection con, String qid, String cnt, String uid, String uname, @AfterCommit List<Runnable> runs)
			throws SQLException, JfwBaseException {
		Question q = questionDao.query(con, qid);
		if (q == null) {
			throw new JfwBaseException(50000, "question[" + qid + "] not found");
@@ -228,7 +242,7 @@ public class Service {
		String id = StringUtil.buildUUID();
		Answer a = new Answer();
		a.setId(id);
		a.setAccept(0);
		a.setAgree(0);
		a.setBallot(0);
		a.setCnt(cnt);
		a.setQid(qid);
@@ -242,6 +256,7 @@ public class Service {
			}
			throw e;
		}
		notifyService.notify(con, q.getUid(), uid, uname, qid, q.getTitle(), NotifyType.ANSWER_QUESTION, runs);
		return id;
	}
@@ -274,7 +289,7 @@ public class Service {
	@Get
	@Path("/qm")
	public List<Question> queryOne(@JdbcConn Connection con, String[] ids) throws SQLException {
	public List<Question> query(@JdbcConn Connection con, String[] ids) throws SQLException {
		return questionDao.query(con, ids);
	}
@@ -358,7 +373,7 @@ public class Service {
	 * @throws SQLException
	 */
	@Get
	@Path("/answer/my")
	@Path("/answer/bySelf")
	public List<Answer> answerSelf(@JdbcConn Connection con, String uid, @DefaultValue("\"0\"") String time, @DefaultValue("\"0\"") String id,
			@DefaultValue("10000000") int rows) throws SQLException {
		return questionDao.answerSelf(con, uid, time, id, rows);
@@ -380,11 +395,29 @@ public class Service {
	 * @throws SQLException
	 */
	@Get
	@Path("/answer/my")
	@Path("/answer/byWatch")
	public List<Answer> answerWatch(@JdbcConn Connection con, String uid, @DefaultValue("\"0\"") String time, @DefaultValue("\"0\"") String id,
			@DefaultValue("10000000") int rows) throws SQLException {
		return questionDao.watchAnswer(con, uid, time, id, rows);
	}
	
	/**
	 * 查询所有合法的回答（“发布中”的问题下的“发布中”的回答。);
	 * 按最新回答时间，由新到旧排序
	}）
	 * @param con
	 * @param time
	 * @param id
	 * @param rows
	 * @return
	 * @throws SQLException
	 */
	@Get
	@Path("/answer/byTime")
	public List<Answer> answerByTime(@JdbcConn Connection con,@DefaultValue("\"99999999999999\"") String time, @DefaultValue("\"0\"") String id,
			@DefaultValue("10000000") int rows) throws SQLException {
		return questionDao.answer(con,  time, id, rows);
	}
	/**
	 * 指定提问的回答(按最新回答时间，由新到旧排序）
	 * 
@@ -406,6 +439,7 @@ public class Service {
			@DefaultValue("10000000") int rows) throws SQLException {
		return questionDao.byQes(con, qid, time, id, rows);
	}
	/**
	 * 指定提问的回答(按最新回答时间，由新到旧排序）
	 * 
@@ -427,6 +461,8 @@ public class Service {
			@DefaultValue("10000000") int rows) throws SQLException {
		return questionDao.byQes(con, qid, score, id, rows);
	}
	
	
	/**
	 * 我的回答总点赞数
@@ -438,82 +474,89 @@ public class Service {
	 * @throws SQLException
	 */
	@Get
	@Path("/answer/my/accept/count")
	@Path("/answer/my/agree/count")
	public int queryCountWithMyAnswer(@JdbcConn Connection con, final String id) throws SQLException {
		return JdbcUtil.queryInt(con, "SELECT COUNT(ACCEPT) FROM ANSWER WHERE UID=?", new PreparedStatementConfig() {
		return JdbcUtil.queryInt(con, "SELECT COUNT(AGREE) FROM ANSWER WHERE UID=?", new PreparedStatementConfig() {
			@Override
			public void config(PreparedStatement ps) throws SQLException {
				ps.setString(1, id);
			}
		}, 0);
	}
	
	@Post
	@Path("/answer/accept")
	public void accept(@JdbcConn(true) Connection con,String id,String uid,String uname,@AfterCommit List<Runnable> runs)throws SQLException, JfwBaseException{
		AnswerAcceptRec aar = new AnswerAcceptRec();
	@Path("/answer/agree")
	public void agree(@JdbcConn(true) Connection con, String id, String uid, String uname, @AfterCommit List<Runnable> runs)
			throws SQLException, JfwBaseException {
		Answer a = questionDao.queryAnswer(con, id);
		if (a == null)
			throw new JfwBaseException(50000, "answer[" + id + "] not found");
		String qid = a.getQid();
		Question q = questionDao.query(con, qid);
		if (q == null)
			throw new JfwBaseException(50000, "answer[" + id + "] ' question  not found");
		AnswerAgreeRec aar = new AnswerAgreeRec();
		aar.setAid(id);
		aar.setUid(uid);
		aar.setFlag(true);
		boolean inserted = false;
		try{
			questionDao.insert(con,aar);
			inserted=true;
		}catch(SQLException e){
			if(SqlUtil.unique(e)){
		try {
			questionDao.insert(con, aar);
			inserted = true;
		} catch (SQLException e) {
			if (SqlUtil.unique(e)) {
				con.rollback();
			}
			throw e;
		}
		if(inserted){
		if (inserted) {
			questionDao.update(con, id, 1, 1);
		}else{
			if(questionDao.accept(con, uid, id) >0){
				questionDao.update(con,id,1,0);
			}else{
				throw new JfwBaseException(50001,"duplicate answer accept");
		} else {
			if (questionDao.agree(con, uid, id) > 0) {
				questionDao.update(con, id, 1, 0);
			} else {
				throw new JfwBaseException(50001, "duplicate answer agree");
			}
			
		}
		runs.add(new Runnable(){
			@Override
			public void run() {
				// TODO send notify
			}});
		notifyService.notify(con, a.getUid(), uid, uname, a.getId(), q.getTitle(), NotifyType.ACCEPT_ANSWER, runs);
	}
	@Post
	@Path("/answer/unAccept")
	public void unAccept(@JdbcConn(true) Connection con,String id,String uid,String uname,@AfterCommit List<Runnable> runs)throws SQLException, JfwBaseException{
		AnswerAcceptRec aar = new AnswerAcceptRec();
	@Path("/answer/unAgree")
	public void unAgree(@JdbcConn(true) Connection con, String id, String uid, String uname, @AfterCommit List<Runnable> runs)
			throws SQLException, JfwBaseException {
		AnswerAgreeRec aar = new AnswerAgreeRec();
		aar.setAid(id);
		aar.setUid(uid);
		aar.setFlag(false);
		boolean inserted = false;
		try{
			questionDao.insert(con,aar);
			inserted=true;
		}catch(SQLException e){
			if(SqlUtil.unique(e)){
		try {
			questionDao.insert(con, aar);
			inserted = true;
		} catch (SQLException e) {
			if (SqlUtil.unique(e)) {
				con.rollback();
			}
			throw e;
		}
		if(inserted){
		if (inserted) {
			questionDao.update(con, id, 0, 1);
		}else{
			if(questionDao.unAccept(con, uid, id) >0){
				questionDao.update(con,id,-1,0);
			}else{
				throw new JfwBaseException(50001,"duplicate answer unaccept");
		} else {
			if (questionDao.unAgree(con, uid, id) > 0) {
				questionDao.update(con, id, -1, 0);
			} else {
				throw new JfwBaseException(50001, "duplicate answer unagree");
			}
		}
		runs.add(new Runnable(){
		runs.add(new Runnable() {
			@Override
			public void run() {
				// TODO send notify
			}});
			}
		});
	}
	public QetKeyWord[] build(String id, List<String> ss) {

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

@@ -20,11 +20,13 @@ 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.AfterCommit;
import org.jfw.apt.web.annotation.param.JdbcConn;
import org.jfw.util.DateUtil;
import org.jfw.util.JpgUtil;
import org.jfw.util.PageQueryResult;
import org.jfw.util.StringUtil;
import org.jfw.util.codec.JfwInvalidCodecKeyException;
import org.jfw.util.exception.JfwBaseException;
import org.jfw.util.io.IoUtil;
@@ -41,6 +43,8 @@ import com.ekexiu.portal.dao.ProfessorDao;
import com.ekexiu.portal.dao.ResearchAreaDao;
import com.ekexiu.portal.dao.ResourceDao;
import com.ekexiu.portal.dao.WatchDao;
import com.ekexiu.portal.notify.NotifyService;
import com.ekexiu.portal.notify.NotifyType;
import com.ekexiu.portal.po.Article;
import com.ekexiu.portal.po.ArticleAgree;
import com.ekexiu.portal.po.ArticleOrg;
@@ -95,6 +99,18 @@ public class ArticleService {
	@Autowrie
	private TemplateService templateService;
	
	@Autowrie
	private NotifyService notifyService;
	
	public NotifyService getNotifyService() {
		return notifyService;
	}
	public void setNotifyService(NotifyService notifyService) {
		this.notifyService = notifyService;
	}
	public TemplateService getTemplateService() {
		return templateService;
@@ -747,12 +763,19 @@ public class ArticleService {
	@Post
	@Path("/agree")
	public void agree(@JdbcConn(true) Connection con, String operateId, String articleId) throws SQLException {
	public void agree(@JdbcConn(true) Connection con, String operateId, String articleId,String uname,@AfterCommit List<Runnable> runs) throws SQLException {
		final Article article = this.articleDao.queryOne(con, articleId);
		if(article==null){
			throw new IllegalArgumentException("not found article["+articleId+ "]");
		}
		if (this.articleDao.incAgree(con, articleId) > 0) {
			ArticleAgree articleAgree = new ArticleAgree();
			articleAgree.setOperateId(operateId);
			articleAgree.setArticleId(articleId);
			this.articleAgreeDao.insert(con, articleAgree);
			if(article.getArticleType().equals("1")){
				this.notifyService.notify(con, article.getProfessorId(), operateId, uname, articleId, article.getArticleTitle(), NotifyType.AGREE_ARTICLE, runs);
			}
		}
	}

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

@@ -11,12 +11,16 @@ 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.AfterCommit;
import org.jfw.apt.web.annotation.param.JdbcConn;
import org.jfw.util.PageQueryResult;
import org.jfw.util.exception.JfwBaseException;
import com.ekexiu.portal.dao.PaperAgreeDao;
import com.ekexiu.portal.dao.PaperAuthorDao;
import com.ekexiu.portal.dao.PpaperDao;
import com.ekexiu.portal.notify.NotifyService;
import com.ekexiu.portal.notify.NotifyType;
import com.ekexiu.portal.po.PaperAgree;
import com.ekexiu.portal.po.PaperAuthor;
import com.ekexiu.portal.po.Ppaper;
@@ -29,15 +33,23 @@ public class PpaperService {
	private PpaperDao ppaperDao;
	@Autowrie
	private PaperAuthorDao paperAuthorDao;
	
	@Autowrie
	private KeyWordService keyWordService;
	
	@Autowrie
	private PaperAgreeDao paperAgreeDao;
	
	
	
	@Autowrie
	private NotifyService notifyService;
	public NotifyService getNotifyService() {
		return notifyService;
	}
	public void setNotifyService(NotifyService notifyService) {
		this.notifyService = notifyService;
	}
	public PaperAgreeDao getPaperAgreeDao() {
		return paperAgreeDao;
@@ -164,57 +176,72 @@ public class PpaperService {
	@Path("/kw")
	public void update(@JdbcConn(true) Connection con, String id, @Nullable String keywords) throws SQLException {
		this.ppaperDao.update(con, id, keywords);
		this.keyWordService.refreshPaper(con, id, KeyWordService.splitKeyWord(keywords));		
		this.keyWordService.refreshPaper(con, id, KeyWordService.splitKeyWord(keywords));
	}
	@Get
	@Path("/byShareId")
	public Ppaper query(@JdbcConn Connection con,long id) throws SQLException{
		return this.ppaperDao.query(con,id);
	public Ppaper query(@JdbcConn Connection con, long id) throws SQLException {
		return this.ppaperDao.query(con, id);
	}
	@Get
	@Path("/ralatePapers")
	public List<Ppaper> ralatePapers(@JdbcConn Connection con,String paperId,@DefaultValue("5") int rows)throws SQLException{
	public List<Ppaper> ralatePapers(@JdbcConn Connection con, String paperId, @DefaultValue("5") int rows) throws SQLException {
		String[] ids = this.ppaperDao.queryPaperIdWithSameKeyWord(con, paperId, rows);
		if(ids!=null){
			return this.ppaperDao.query(con,ids);
		if (ids != null) {
			return this.ppaperDao.query(con, ids);
		}
		return Collections.<Ppaper>emptyList();
		return Collections.<Ppaper> emptyList();
	}
	
	
	@Post
	@Path("/agree")
	public void agree(@JdbcConn(true) Connection con,String id,String uid)throws SQLException{
	public void agree(@JdbcConn(true) Connection con, String id, String uid, String uname, @AfterCommit List<Runnable> runs) throws SQLException, JfwBaseException {
		Ppaper p = this.ppaperDao.query(con, id);
		if (p == null) {
			throw new JfwBaseException(50000, "paper[" + id + "] not found");
		}
		PaperAgree pa = new PaperAgree();
		pa.setOpId(uid);
		pa.setPaperId(id);
		this.paperAgreeDao.insert(con, pa);		
	}
	
//	@Post
//	@Path("/unAgree")
//	public void unAgree(@JdbcConn(true) Connection con,String id,String uid)throws SQLException{
//		this.paperAgreeDao.delete(con,uid, id);
//	}
	
		this.paperAgreeDao.insert(con, pa);
		List<PaperAuthor> pas = this.paperAuthorDao.query(con, id);
		for (PaperAuthor au : pas) {
			if (!au.getProfessorId().startsWith("#")) {
				this.notifyService.notify(con, au.getProfessorId(), uid, uname, id, p.getName(), NotifyType.AGREE_PAPER, runs);
			}
		}
	}
	// @Post
	// @Path("/unAgree")
	// public void unAgree(@JdbcConn(true) Connection con,String id,String
	// uid)throws SQLException{
	// this.paperAgreeDao.delete(con,uid, id);
	// }
	@Get
	@Path("/agree")
	public boolean hasAgree(@JdbcConn(false) Connection con,String id,String uid)throws SQLException{
		return null!= this.paperAgreeDao.query(con,uid, id);
	public boolean hasAgree(@JdbcConn(false) Connection con, String id, String uid) throws SQLException {
		return null != this.paperAgreeDao.query(con, uid, id);
	}
	@Get
	@Path("/agreeCount")
	public int agreeCount(@JdbcConn(false) Connection con,String id)throws SQLException{
		return this.paperAgreeDao.query(con,id);
	public int agreeCount(@JdbcConn(false) Connection con, String id) throws SQLException {
		return this.paperAgreeDao.query(con, id);
	}
	
	@Get
	@Path("/assPapers")
	public List<Ppaper> assPapers(@JdbcConn Connection con,String[] kws,@DefaultValue("5") int rows) throws SQLException{
		if(kws==null || kws.length==0) return Collections.<Ppaper>emptyList();		
	public List<Ppaper> assPapers(@JdbcConn Connection con, String[] kws, @DefaultValue("5") int rows) throws SQLException {
		if (kws == null || kws.length == 0)
			return Collections.<Ppaper> emptyList();
		String[] ids = this.ppaperDao.queryPatentIdWithKeyWord(con, kws, rows);
		if(ids==null || ids.length==0) return Collections.<Ppaper>emptyList();
		return this.ppaperDao.query(con, ids);		
		if (ids == null || ids.length == 0)
			return Collections.<Ppaper> emptyList();
		return this.ppaperDao.query(con, ids);
	}
}

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

@@ -11,12 +11,16 @@ 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.AfterCommit;
import org.jfw.apt.web.annotation.param.JdbcConn;
import org.jfw.util.PageQueryResult;
import org.jfw.util.exception.JfwBaseException;
import com.ekexiu.portal.dao.PatentAgreeDao;
import com.ekexiu.portal.dao.PatentAuthorDao;
import com.ekexiu.portal.dao.PpatentDao;
import com.ekexiu.portal.notify.NotifyService;
import com.ekexiu.portal.notify.NotifyType;
import com.ekexiu.portal.po.PatentAgree;
import com.ekexiu.portal.po.PatentAuthor;
import com.ekexiu.portal.po.Ppatent;
@@ -36,8 +40,19 @@ public class PpatentServcie {
	@Autowrie
	private PatentAgreeDao patentAgreeDao;
	
	@Autowrie
	private NotifyService notifyService;
	
	
	public NotifyService getNotifyService() {
		return notifyService;
	}
	public void setNotifyService(NotifyService notifyService) {
		this.notifyService = notifyService;
	}
	public PatentAgreeDao getPatentAgreeDao() {
		return patentAgreeDao;
	}
@@ -178,11 +193,21 @@ public class PpatentServcie {
	
	@Post
	@Path("/agree")
	public void agree(@JdbcConn(true) Connection con,String id,String uid)throws SQLException{
	public void agree(@JdbcConn(true) Connection con,String id,String uid,String uname,@AfterCommit List<Runnable> runs)throws SQLException, JfwBaseException{
		Ppatent p = ppatentDao.query(con, id);
		if(p==null){
			throw new JfwBaseException(50000, "patent["+id+"] not found");
		}
		PatentAgree pa = new PatentAgree();
		pa.setOpId(uid);
		pa.setPatentId(id);
		this.patentAgreeDao.insert(con, pa);		
		List<PatentAuthor> authors = this.patentAuthorDao.query(con,id);
		for(PatentAuthor pau:authors){
			if(!pau.getProfessorId().startsWith("#")){
				this.notifyService.notify(con,pau.getProfessorId(), uid, uname, id,p.getName(), NotifyType.AGREE_PATENT, runs);
			}
		}
	}
	
//	@Post

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

@@ -10,12 +10,15 @@ import org.jfw.apt.web.annotation.operate.Delete;
import org.jfw.apt.web.annotation.operate.Get;
import org.jfw.apt.web.annotation.operate.Post;
import org.jfw.apt.web.annotation.operate.Put;
import org.jfw.apt.web.annotation.param.AfterCommit;
import org.jfw.apt.web.annotation.param.JdbcConn;
import org.jfw.apt.web.annotation.param.PathVar;
import org.jfw.apt.web.annotation.param.RequestBody;
import com.ekexiu.portal.dao.ResearchAreaDao;
import com.ekexiu.portal.dao.ResearchAreaLogDao;
import com.ekexiu.portal.notify.NotifyService;
import com.ekexiu.portal.notify.NotifyType;
import com.ekexiu.portal.po.ResearchArea;
import com.ekexiu.portal.po.ResearchAreaLog;
@@ -27,6 +30,18 @@ public class ResearchAreaService {
	@Autowrie
	private ResearchAreaLogDao researchAreaLogDao;
	@Autowrie
	private NotifyService notifyService;
	
	
	public NotifyService getNotifyService() {
		return notifyService;
	}
	public void setNotifyService(NotifyService notifyService) {
		this.notifyService = notifyService;
	}
	public ResearchAreaDao getResearchAreaDao() {
		return researchAreaDao;
	}
@@ -51,7 +66,7 @@ public class ResearchAreaService {
	@Post
	@Path("/agree")
	public void agree(@JdbcConn(true) Connection con, String targetId, String targetCaption, String opId) throws SQLException {
	public void agree(@JdbcConn(true) Connection con, String targetId, String targetCaption, String opId,String uname,@AfterCommit List<Runnable> runs) throws SQLException {
		if (this.researchAreaDao.inc(con, targetId, targetCaption) > 0) {
			ResearchAreaLog log = new ResearchAreaLog();
@@ -59,6 +74,7 @@ public class ResearchAreaService {
			log.setOpreteProfessorId(opId);
			log.setProfessorId(targetId);
			this.researchAreaLogDao.insert(con, log);
			this.notifyService.notify(con, targetId, opId, uname, targetId, targetCaption,NotifyType.AGREE_RESEARCH_AREA, runs);
		}
	}

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

@@ -9,6 +9,7 @@ import org.jfw.apt.annotation.DefaultValue;
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.AfterCommit;
import org.jfw.apt.web.annotation.param.JdbcConn;
import org.jfw.util.PageQueryResult;
@@ -19,6 +20,8 @@ import com.ekexiu.portal.dao.ProfessorDao;
import com.ekexiu.portal.dao.ResearchAreaDao;
import com.ekexiu.portal.dao.ResourceDao;
import com.ekexiu.portal.dao.WatchDao;
import com.ekexiu.portal.notify.NotifyService;
import com.ekexiu.portal.notify.NotifyType;
import com.ekexiu.portal.po.Article;
import com.ekexiu.portal.po.Resource;
import com.ekexiu.portal.po.Watch;
@@ -26,6 +29,7 @@ import com.ekexiu.portal.pojo.EditProfessor;
@Path("/watch")
public class WatchService {
	@Autowrie
	private WatchDao watchDao;
	@Autowrie
@@ -42,113 +46,142 @@ public class WatchService {
	private OrgDao orgDao;
	@Autowrie
	private ImageDao imageDao;
	
	@Autowrie
	private NotifyService notifyService;
	public NotifyService getNotifyService() {
		return notifyService;
	}
	public void setNotifyService(NotifyService notifyService) {
		this.notifyService = notifyService;
	}
	public WatchDao getWatchDao() {
		return watchDao;
	}
	public void setWatchDao(WatchDao watchDao) {
		this.watchDao = watchDao;
	}
	public ProfessorDao getProfessorDao() {
		return professorDao;
	}
	public void setProfessorDao(ProfessorDao professorDao) {
		this.professorDao = professorDao;
	}
	public ResourceDao getResourceDao() {
		return resourceDao;
	}
	public void setResourceDao(ResourceDao resourceDao) {
		this.resourceDao = resourceDao;
	}
	public ImageService getImageService() {
		return imageService;
	}
	public void setImageService(ImageService imageService) {
		this.imageService = imageService;
	}
	public ResearchAreaDao getResearchAreaDao() {
		return researchAreaDao;
	}
	public void setResearchAreaDao(ResearchAreaDao researchAreaDao) {
		this.researchAreaDao = researchAreaDao;
	}
	public ArticleDao getArticleDao() {
		return articleDao;
	}
	public void setArticleDao(ArticleDao articleDao) {
		this.articleDao = articleDao;
	}
	public OrgDao getOrgDao() {
		return orgDao;
	}
	public void setOrgDao(OrgDao orgDao) {
		this.orgDao = orgDao;
	}
	public ImageDao getImageDao() {
		return imageDao;
	}
	public void setImageDao(ImageDao imageDao) {
		this.imageDao = imageDao;
	}
	
	@Post
	@Path
	public String insert(@JdbcConn(true) Connection con, Watch watch) throws SQLException{
	public String insert(@JdbcConn(true) Connection con, Watch watch, final String uname, @AfterCommit List<Runnable> runs) throws SQLException {
		this.watchDao.insert(con, watch);
		if (watch.getWatchType() == 1) {
			this.notifyService.notify(con, watch.getWatchObject(), watch.getProfessorId(), uname, watch.getWatchObject(), watch.getWatchObject(),
					NotifyType.WATCH_USER, runs);
		}
		return watch.getWatchObject();
	}
	
	@Post
	@Path("/delete")
	public void delete(@JdbcConn(true) Connection con, String professorId, String watchObject) throws SQLException{
	public void delete(@JdbcConn(true) Connection con, String professorId, String watchObject) throws SQLException {
		this.watchDao.delete(con, professorId, watchObject);
	}
	
	@Get
	@Path("/hasWatch")
	public Watch queryOne(@JdbcConn Connection con, String professorId, String watchObject) throws SQLException {
		return this.watchDao.queryOne(con, professorId, watchObject);
	}
	
	
	@Get
	@Path("/qaPro")
	public PageQueryResult<Watch> queryPro(@JdbcConn Connection con, String professorId, short watchType, 
			@DefaultValue("10") int pageSize, @DefaultValue("1") int pageNo) throws SQLException {
	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();
		if(1 == watchType){
		if (1 == watchType) {
			for (Watch watch : watchs) {
				EditProfessor professor = this.professorDao.queryBaseInfo(con, watch.getWatchObject());
				if(professor != null) {
				if (professor != null) {
					professor.setHasHeadImage(this.imageService.hasProfessorImage(watch.getWatchObject()));
					professor.setResearchAreas(this.researchAreaDao.query(con, watch.getWatchObject()));
					professor.setResources(this.resourceDao.queryList(con, watch.getWatchObject()));
				}
				watch.setProfessor(professor);
			}
		}else if(2 == watchType){
		} else if (2 == watchType) {
			for (Watch watch : watchs) {
				Resource resource = this.resourceDao.queryOne(con, watch.getWatchObject());
				if(resource != null) {
				if (resource != null) {
					resource.setImages(this.imageDao.queryRes(con, resource.getResourceId()));
					if("1".equals(resource.getResourceType())){
					if ("1".equals(resource.getResourceType())) {
						resource.setEditProfessor(this.professorDao.queryBaseInfo(con, resource.getProfessorId()));
					}else if("2".equals(resource.getResourceType())){
					} else if ("2".equals(resource.getResourceType())) {
						resource.setOrganization(this.orgDao.queryEditOrg(con, resource.getOrgId()));
					}
				}
				watch.setResource(resource);
			}
		}else if(3 == watchType){
		} else if (3 == watchType) {
			for (Watch watch : watchs) {
				Article article = this.articleDao.queryOne(con, watch.getWatchObject());
				if(article != null){
					if("1".equals(article.getArticleType())){
				if (article != null) {
					if ("1".equals(article.getArticleType())) {
						article.setProfessor(this.professorDao.queryBaseInfo(con, article.getProfessorId()));
					}else if("2".equals(article.getArticleType())){
					} else if ("2".equals(article.getArticleType())) {
						article.setOrganization(this.orgDao.query(con, article.getOrgId()));
					}
				}
@@ -157,14 +190,14 @@ public class WatchService {
		}
		return queryResult;
	}
	
	@Get
	@Path("/qaWatch")
	public List<Watch> queryWatch(@JdbcConn Connection con, String watchObject) throws SQLException{
	public List<Watch> queryWatch(@JdbcConn Connection con, String watchObject) throws SQLException {
		List<Watch> watchs = this.watchDao.queryWatch(con, watchObject);
		for (Watch watch : watchs) {
			EditProfessor professor = this.professorDao.queryBaseInfo(con, watch.getProfessorId());
			if(professor != null) {
			if (professor != null) {
				professor.setHasHeadImage(this.imageService.hasProfessorImage(watch.getProfessorId()));
				professor.setResearchAreas(this.researchAreaDao.query(con, watch.getProfessorId()));
				professor.setResources(this.resourceDao.queryList(con, watch.getProfessorId()));
@@ -173,16 +206,17 @@ public class WatchService {
		}
		return watchs;
	}
	
	@Get
	@Path("/countObject")
	public int countObject(@JdbcConn Connection con,String id,short type)throws SQLException{
	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{
	public int countProfessor(@JdbcConn Connection con, String id, short type) throws SQLException {
		return this.watchDao.countProfessor(con, id, type);
	}
	
}

src/main/resources/database.sql

@@ -2098,8 +2098,91 @@ COMMENT ON COLUMN WEB_MSG_CNT.SEND_TIME is '消息发送时间';
COMMENT ON COLUMN WEB_MSG_CNT.READED is '消息是否已读';
--modify begin at version2.20
CREATE TABLE LEAVE_MSG (ID CHAR(32) NOT NULL,CNT TEXT NOT NULL,REF_ID TEXT NOT NULL,REF_TYPE CHAR(1) NOT NULL,
TOP TEXT NOT NULL,PARENT TEXT,SENDER TEXT NOT NULL,RECIVER TEXT,STATE CHAR(1) NOT NULL,AGREE_COUNT BIGINT NOT NULL,CREATE_TIME CHAR(14) NOT NULL,MODIFY_TIME CHAR(14) NOT NULL);
ALTER TABLE LEAVE_MSG ADD PRIMARY KEY (ID);
COMMENT ON TABLE LEAVE_MSG is '留言表（新）';
COMMENT ON COLUMN LEAVE_MSG.ID is '留言ID';
COMMENT ON COLUMN LEAVE_MSG.CNT is '留言内容';
COMMENT ON COLUMN LEAVE_MSG.REF_ID is '留言对象ID';
COMMENT ON COLUMN LEAVE_MSG.REF_TYPE is '留言对象分类 1：文章 2：论文 3：专利 4:回答';
COMMENT ON COLUMN LEAVE_MSG.TOP is '顶级留言（只针对对象不针对留言）';
COMMENT ON COLUMN LEAVE_MSG.PARENT is '回复的留言ID';
COMMENT ON COLUMN LEAVE_MSG.SENDER is '留言人ID';
COMMENT ON COLUMN LEAVE_MSG.RECIVER is '被回复的留言人ID';
COMMENT ON COLUMN LEAVE_MSG.STATE is '状态 1：发布中';
COMMENT ON COLUMN LEAVE_MSG.AGREE_COUNT is '被点赞数量';
CREATE TABLE LEAVE_MSG_AGREE_REC (ID TEXT NOT NULL,UID TEXT NOT NULL,CREATE_TIME CHAR(14) NOT NULL);
ALTER TABLE LEAVE_MSG_AGREE_REC ADD PRIMARY KEY (ID,UID);
COMMENT ON TABLE LEAVE_MSG_AGREE_REC is '留言点赞记录表';
COMMENT ON COLUMN LEAVE_MSG_AGREE_REC.ID is '留言ID';
COMMENT ON COLUMN LEAVE_MSG_AGREE_REC.UID is '点赞人ID';
CREATE TABLE QUESTION (ID CHAR(32) NOT NULL,TITLE TEXT NOT NULL,
CNT TEXT,IMG TEXT,KEYS TEXT NOT NULL,
UID TEXT NOT NULL,LAST_REPLY_TIME CHAR(14),
REPLY_COUNT BIGINT NOT NULL,STATE CHAR(1) NOT NULL,CREATE_TIME CHAR(14) NOT NULL,MODIFY_TIME CHAR(14) NOT NULL);
ALTER TABLE QUESTION ADD PRIMARY KEY (ID);
COMMENT ON TABLE QUESTION is '提问表';
COMMENT ON COLUMN QUESTION.ID is '提问ID';
COMMENT ON COLUMN QUESTION.TITLE is '提问标题';
COMMENT ON COLUMN QUESTION.CNT is '提问描述';
COMMENT ON COLUMN QUESTION.IMG is '提问图片（英文逗号分隔）';
COMMENT ON COLUMN QUESTION.KEYS is '提问关键词（英文逗号分隔）';
COMMENT ON COLUMN QUESTION.UID is '提问人ID';
COMMENT ON COLUMN QUESTION.LAST_REPLY_TIME is '最后回答时间';
COMMENT ON COLUMN QUESTION.REPLY_COUNT is '回答次数';
COMMENT ON COLUMN QUESTION.STATE is '状态 1：发布中';
CREATE TABLE ANSWER (ID CHAR(32) NOT NULL,QID TEXT NOT NULL,UID TEXT NOT NULL,STATE CHAR(1) NOT NULL,
CNT TEXT NOT NULL,AGREE BIGINT NOT NULL,BALLOT BIGINT NOT NULL,CREATE_TIME CHAR(14) NOT NULL,MODIFY_TIME CHAR(14) NOT NULL);
ALTER TABLE ANSWER ADD PRIMARY KEY (ID);
ALTER TABLE ANSWER ADD UNIQUE (QID,UID);
COMMENT ON TABLE ANSWER is '回答表';
COMMENT ON COLUMN ANSWER.ID is '回答ID';
COMMENT ON COLUMN ANSWER.QID is '提问ID';
COMMENT ON COLUMN ANSWER.CNT is '回答内容';
COMMENT ON COLUMN ANSWER.UID is '回答人ID';
COMMENT ON COLUMN ANSWER.AGREE is '赞同票数';
COMMENT ON COLUMN ANSWER.BALLOT is '总投票数';
COMMENT ON COLUMN ANSWER.STATE is '状态 1：发布中';
CREATE TABLE ANSWER_AGREE_REC (UID TEXT NOT NULL,AID TEXT NOT NULL,FLAG CHAR(1) NOT NULL);
ALTER TABLE ANSWER_AGREE_REC ADD PRIMARY KEY (UID,AID);
COMMENT ON TABLE ANSWER_AGREE_REC is '回答投票表';
COMMENT ON COLUMN ANSWER_AGREE_REC.AID is '回答ID';
COMMENT ON COLUMN ANSWER_AGREE_REC.UID is '投票人ID';
COMMENT ON COLUMN ANSWER_AGREE_REC.FLAG is '1：赞同票  0：反对票';
CREATE TABLE QET_KEY_WORD (ID TEXT NOT NULL,KW TEXT NOT NULL);
ALTER TABLE QET_KEY_WORD ADD PRIMARY KEY (ID,KW);
CREATE TABLE NOTIFY_MSG_IDX (RECIVER TEXT NOT NULL,LAST_CNT TEXT NOT NULL,LAST_TIME TEXT NOT NULL,UN_READ INTEGER NOT NULL);
ALTER TABLE NOTIFY_MSG_IDX ADD PRIMARY KEY (RECIVER);
COMMENT ON TABLE NOTIFY_MSG_IDX is '通知索引表';
COMMENT ON COLUMN NOTIFY_MSG_IDX.RECIVER is '接收人ID';
COMMENT ON COLUMN NOTIFY_MSG_IDX.LAST_CNT is '最后通知内容';
COMMENT ON COLUMN NOTIFY_MSG_IDX.LAST_TIME is '最后通知时间';
COMMENT ON COLUMN NOTIFY_MSG_IDX.UN_READ is '未读通知数';
CREATE TABLE NOTIFY_MSG_CNT (ID CHAR(32) NOT NULL,CNT TEXT NOT NULL,RECIVER TEXT NOT NULL,READED CHAR(1) NOT NULL,
PID TEXT NOT NULL,UID TEXT NOT NULL,CREATE_TIME TEXT NOT NULL,OP_TYPE INTEGER NOT NULL);
ALTER TABLE NOTIFY_MSG_CNT ADD PRIMARY KEY (ID);
COMMENT ON TABLE NOTIFY_MSG_CNT is '通知内容表';
COMMENT ON COLUMN NOTIFY_MSG_CNT.ID is '通知ID';
COMMENT ON COLUMN NOTIFY_MSG_CNT.CNT is '通知内容';
COMMENT ON COLUMN NOTIFY_MSG_CNT.RECIVER is '接收人ID';
COMMENT ON COLUMN NOTIFY_MSG_CNT.READED is '是否已读，1：已读  0:未读';
COMMENT ON COLUMN NOTIFY_MSG_CNT.PID is '参数ID';
COMMENT ON COLUMN NOTIFY_MSG_CNT.UID is '通知触发人ID';
COMMENT ON COLUMN NOTIFY_MSG_CNT.UID is '通知类型(详见文档)';