11

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

@@ -125,7 +125,7 @@ public class Service {
	}
	// 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)
	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);
@@ -134,9 +134,15 @@ public class Service {
			}
			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);
					if (!uid.equals(article.getProfessorId())) {
						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);
					if (!uid.equals(reciver)) {
						this.notifyService.notify(con, reciver, uid, uname, lid, article.getArticleTitle(),
								agree ? NotifyType.AGREE_LEAVE_MSG_AT_ARTICLE : NotifyType.REPLY_LEAVE_MSG_AT_ARTICLE, runs);
					}
				}
			}
@@ -147,12 +153,15 @@ public class Service {
			}
			if (reciver == null) {
				for (PaperAuthor pa : this.paperAuthorDao.query(con, id)) {
					if (!pa.getProfessorId().startsWith("#")) {
					if (!pa.getProfessorId().startsWith("#") && (!uid.equals(pa.getProfessorId()))) {
						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);
				if (!uid.equals(reciver)) {
					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);
@@ -161,16 +170,19 @@ public class Service {
			}
			if (reciver == null) {
				for (PatentAuthor pa : this.patentAuthorDao.query(con, id)) {
					if (!pa.getProfessorId().startsWith("#")) {
					if (!pa.getProfessorId().startsWith("#") && (!uid.equals(pa.getProfessorId()))) {
						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);
				if (!uid.equals(reciver)) {
					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){
			if (a == null) {
				throw new JfwBaseException(50000, "answer[" + id + "] not found");
			}
			Question q = this.questionDao.query(con, a.getQid());
@@ -178,9 +190,14 @@ public class Service {
				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);
				if (!uid.equals(a.getUid())) {
					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);
				if (!uid.equals(reciver)) {
					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();
@@ -207,7 +224,7 @@ public class Service {
	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 uname, @AfterCommit List<Runnable> runs) throws SQLException, JfwBaseException {
			String uname, @AfterCommit List<Runnable> runs) throws SQLException, JfwBaseException {
		String id = StringUtil.buildUUID();
		String time = DateUtil.formatDateTime(System.currentTimeMillis());
		msg.setId(id);
@@ -216,9 +233,9 @@ public class Service {
		msg.setParent(null);
		msg.setAgreeCount(0);
		msg.setCreateTime(time);
		msg.setTimeDesc(time+id);
		msg.setTimeDesc(time + id);
		leaveMsgDao.insert(con, msg);
		this.notify(con, msg.getRefType(), msg.getRefId(), null, msg.getSender(), uname, id,false, runs);
		this.notify(con, msg.getRefType(), msg.getRefId(), null, msg.getSender(), uname, id, false, runs);
		return id;
	}
@@ -243,8 +260,8 @@ public class Service {
	 */
	@Path("/reply")
	@Post
	public String reply(@JdbcConn(true) Connection con, String cnt, String id, String uid, String uname,
			@AfterCommit List<Runnable> runs) throws SQLException, JfwBaseException {
	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)
			throw new JfwBaseException(50000, "leave message[id:" + id + "] not found");
@@ -260,9 +277,9 @@ public class Service {
		msg.setId(nid);
		String time = DateUtil.formatDateTime(System.currentTimeMillis());
		msg.setCreateTime(time);
		msg.setTimeDesc(time+nid);
		msg.setTimeDesc(time + nid);
		leaveMsgDao.insert(con, msg);
		this.notify(con, msg.getRefType(), msg.getRefId(), msg.getReciver(), uid, uname, id,false, runs);
		this.notify(con, msg.getRefType(), msg.getRefId(), msg.getReciver(), uid, uname, id, false, runs);
		return nid;
	}
@@ -287,7 +304,7 @@ public class Service {
	@Path("/subject")
	public List<LeaveMsg> query(@JdbcConn Connection con, String stype, String sid, @DefaultValue("\"0\"") String time, @DefaultValue("\"0\"") String id,
			int rows) throws SQLException {
		return leaveMsgDao.query(con, sid, stype, time+id, rows);
		return leaveMsgDao.query(con, sid, stype, time + id, rows);
	}
	@Get

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

@@ -185,7 +185,7 @@ public class Service {
	 *            title 标题 ，cnt 描述 img 图片 以英文逗号分隔， keys 关键字 以英文逗号分隔 ，uid 用户ID
	 * @return
	 * @throws SQLException
	 * @throws IOException 
	 * @throws IOException
	 */
	@Path()
	@Post
@@ -289,8 +289,9 @@ public class Service {
			}
			throw e;
		}
		this.notifyService.notify(con, pid, uid, uname, qid, q.getTitle(), NotifyType.INVITE_ANSWER, runs);
		if (!pid.equals(uid)) {
			this.notifyService.notify(con, pid, uid, uname, qid, q.getTitle(), NotifyType.INVITE_ANSWER, runs);
		}
		return true;
	}
@@ -346,7 +347,9 @@ public class Service {
			throw e;
		}
		questionDao.incQuestionReply(con, qid);
		notifyService.notify(con, q.getUid(), uid, uname,id+":"+qid, q.getTitle(), NotifyType.ANSWER_QUESTION, runs);
		if (!uid.equals(q.getUid())) {
			notifyService.notify(con, q.getUid(), uid, uname, id + ":" + qid, q.getTitle(), NotifyType.ANSWER_QUESTION, runs);
		}
		return id;
	}
@@ -441,10 +444,10 @@ public class Service {
			@DefaultValue("10000000") int rows) throws SQLException {
		return questionDao.query(con, "1", uid, time + id, rows);
	}
	
	@Get
	@Path("/answer/count")
	public long answerCount(@JdbcConn Connection con,@Nullable String qid,@Nullable String uid,@Nullable String state) throws SQLException{
	public long answerCount(@JdbcConn Connection con, @Nullable String qid, @Nullable String uid, @Nullable String state) throws SQLException {
		return questionDao.answerCount(con, uid, qid, state);
	}
@@ -634,40 +637,37 @@ public class Service {
				throw new JfwBaseException(50001, "duplicate answer agree");
			}
		}
		notifyService.notify(con, a.getUid(), uid, uname, a.getId()+":"+qid, q.getTitle(), NotifyType.ACCEPT_ANSWER, runs);
		if (!uid.equals(a.getUid())) {
			notifyService.notify(con, a.getUid(), uid, uname, a.getId() + ":" + qid, q.getTitle(), NotifyType.ACCEPT_ANSWER, runs);
		}
	}
	
	
	@Post
	@Path("/answer/agree/cancle")
	public int unAgree(@JdbcConn(true) Connection con, String id, String uid, String uname)
			throws SQLException, JfwBaseException {
	public int unAgree(@JdbcConn(true) Connection con, String id, String uid, String uname) throws SQLException, JfwBaseException {
		Answer a = questionDao.queryAnswer(con, id);
		if (a == null)
			throw new JfwBaseException(50000, "answer[" + id + "] not found");
		
		if(questionDao.deleteAnswerAgreeRec(con, uid, id, true)>0){
		if (questionDao.deleteAnswerAgreeRec(con, uid, id, true) > 0) {
			questionDao.update(con, id, -1, -1);
			return 1;
		}
		return 0;
	}
	@Post
	@Path("/answer/oppose/cancle")
	public int unOpp(@JdbcConn(true) Connection con, String id, String uid, String uname)
			throws SQLException, JfwBaseException {
	public int unOpp(@JdbcConn(true) Connection con, String id, String uid, String uname) throws SQLException, JfwBaseException {
		Answer a = questionDao.queryAnswer(con, id);
		if (a == null)
			throw new JfwBaseException(50000, "answer[" + id + "] not found");
		if(questionDao.deleteAnswerAgreeRec(con, uid, id, false)>0){
		if (questionDao.deleteAnswerAgreeRec(con, uid, id, false) > 0) {
			questionDao.update(con, id, 0, -1);
			return 1;
		}
		return 0;
	}
	
	
	@Get
	@Path("/answer/agree")
@@ -697,8 +697,7 @@ public class Service {
	@Post
	@Path("/answer/oppose")
	public void oppose(@JdbcConn(true) Connection con, String id, String uid, String uname)
			throws SQLException, JfwBaseException {
	public void oppose(@JdbcConn(true) Connection con, String id, String uid, String uname) throws SQLException, JfwBaseException {
		AnswerAgreeRec aar = new AnswerAgreeRec();
		aar.setAid(id);
		aar.setUid(uid);

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

@@ -773,7 +773,7 @@ public class ArticleService {
			articleAgree.setOperateId(operateId);
			articleAgree.setArticleId(articleId);
			this.articleAgreeDao.insert(con, articleAgree);
			if(article.getArticleType().equals("1")){
			if(article.getArticleType().equals("1")  && (!operateId.equals(article.getProfessorId()))){
				this.notifyService.notify(con, article.getProfessorId(), operateId, uname, articleId, article.getArticleTitle(), NotifyType.AGREE_ARTICLE, runs);
			}
		}

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

@@ -209,7 +209,7 @@ public class PpaperService {
		List<PaperAuthor> pas = this.paperAuthorDao.query(con, id);
		for (PaperAuthor au : pas) {
			if (!au.getProfessorId().startsWith("#")) {
			if (!au.getProfessorId().startsWith("#")  && (!uid.equals(au.getProfessorId()))) {
				this.notifyService.notify(con, au.getProfessorId(), uid, uname, id, p.getName(), NotifyType.AGREE_PAPER, runs);
			}
		}

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

@@ -204,7 +204,7 @@ public class PpatentServcie {
		this.patentAgreeDao.insert(con, pa);		
		List<PatentAuthor> authors = this.patentAuthorDao.query(con,id);
		for(PatentAuthor pau:authors){
			if(!pau.getProfessorId().startsWith("#")){
			if(!pau.getProfessorId().startsWith("#") &&(!uid.equals(pau.getProfessorId()))){
				this.notifyService.notify(con,pau.getProfessorId(), uid, uname, id,p.getName(), NotifyType.AGREE_PATENT, runs);
			}
		}

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

@@ -32,8 +32,7 @@ public class ResearchAreaService {
	@Autowrie
	private NotifyService notifyService;
	
	
	public NotifyService getNotifyService() {
		return notifyService;
	}
@@ -60,13 +59,14 @@ public class ResearchAreaService {
	@Get
	@Path("/{professorId}")
	public List<ResearchArea> query(@JdbcConn Connection con,@PathVar String professorId) throws SQLException {
	public List<ResearchArea> query(@JdbcConn Connection con, @PathVar String professorId) throws SQLException {
		return this.researchAreaDao.query(con, professorId);
	}
	@Post
	@Path("/agree")
	public void agree(@JdbcConn(true) Connection con, String targetId, String targetCaption, String opId,String uname,@AfterCommit List<Runnable> runs) 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();
@@ -74,7 +74,9 @@ 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);
			if (!targetId .equals(opId)) {
				this.notifyService.notify(con, targetId, opId, uname, targetId, targetCaption, NotifyType.AGREE_RESEARCH_AREA, runs);
			}
		}
	}
@@ -87,13 +89,13 @@ public class ResearchAreaService {
		}
	}
	
	@Delete
	@Path("/{professorId}")
	public void delete(@JdbcConn(true) Connection con,@PathVar String professorId) throws SQLException{
	public void delete(@JdbcConn(true) Connection con, @PathVar String professorId) throws SQLException {
		this.researchAreaDao.delete(con, professorId);
		this.researchAreaLogDao.delete(con, professorId);
	}
	@Put
	@Path
	public void saveResearchArea(@JdbcConn(true) Connection con, @RequestBody List<ResearchArea> areas) throws SQLException {

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

@@ -126,7 +126,7 @@ public class WatchService {
	@Path
	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) {
		if (watch.getWatchType() == 1 && (!watch.getWatchObject().equals(watch.getProfessorId()))) {
			this.notifyService.notify(con, watch.getWatchObject(), watch.getProfessorId(), uname, watch.getWatchObject(), watch.getWatchObject(),
					NotifyType.WATCH_USER, runs);
		}