Merge branch 'dev' into test

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

@@ -1,35 +1,5 @@
package com.ekexiu.portal.service;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.sql.Connection;
import java.sql.SQLException;
import java.text.SimpleDateFormat;
import java.util.Collections;
import java.util.Date;
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.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;
import com.ekexiu.portal.cms.ContentType;
import com.ekexiu.portal.cms.TemplateService;
import com.ekexiu.portal.dao.ArticleAgreeDao;
@@ -55,6 +25,34 @@ import com.ekexiu.portal.pojo.EditOrganization;
import com.ekexiu.portal.pojo.EditProfessor;
import com.ekexiu.portal.pojo.FindInfo;
import com.ekexiu.portal.pojo.SelfArticle;
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.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.exception.JfwBaseException;
import org.jfw.util.io.IoUtil;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.sql.Connection;
import java.sql.SQLException;
import java.text.SimpleDateFormat;
import java.util.Collections;
import java.util.Date;
import java.util.List;
@Path("/article")
public class ArticleService {
@@ -763,7 +761,7 @@ public class ArticleService {
	@Post
	@Path("/agree")
	public void agree(@JdbcConn(true) Connection con, String operateId, String articleId,String uname,@AfterCommit List<Runnable> runs) throws SQLException {
	public void agree(@JdbcConn(true) Connection con, String operateId, String articleId,@Nullable 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+ "]");
@@ -773,8 +771,10 @@ public class ArticleService {
			articleAgree.setOperateId(operateId);
			articleAgree.setArticleId(articleId);
			this.articleAgreeDao.insert(con, articleAgree);
			if(article.getArticleType().equals("1")  && (!operateId.equals(article.getProfessorId()))){
				this.notifyService.notify(con, article.getProfessorId(), operateId, uname, articleId, article.getArticleTitle(), NotifyType.AGREE_ARTICLE, runs);
			if (uname != null) {
				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

@@ -1,10 +1,14 @@
package com.ekexiu.portal.service;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.Collections;
import java.util.List;
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;
import com.ekexiu.portal.pojo.AssedPaper;
import org.jfw.apt.annotation.Autowrie;
import org.jfw.apt.annotation.DefaultValue;
import org.jfw.apt.annotation.Nullable;
@@ -16,15 +20,10 @@ 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;
import com.ekexiu.portal.pojo.AssedPaper;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.Collections;
import java.util.List;
@Path("/ppaper")
public class PpaperService {
@@ -197,7 +196,7 @@ public class PpaperService {
	@Post
	@Path("/agree")
	public void agree(@JdbcConn(true) Connection con, String id, String uid, String uname, @AfterCommit List<Runnable> runs) throws SQLException, JfwBaseException {
	public void agree(@JdbcConn(true) Connection con, String id, String uid,@Nullable 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");
@@ -207,10 +206,12 @@ public class PpaperService {
		pa.setPaperId(id);
		this.paperAgreeDao.insert(con, pa);
		List<PaperAuthor> pas = this.paperAuthorDao.query(con, id);
		for (PaperAuthor au : pas) {
			if (!au.getProfessorId().startsWith("#")  && (!uid.equals(au.getProfessorId()))) {
				this.notifyService.notify(con, au.getProfessorId(), uid, uname, id, p.getName(), NotifyType.AGREE_PAPER, runs);
		if (uname != null) {
			List<PaperAuthor> pas = this.paperAuthorDao.query(con, id);
			for (PaperAuthor au : pas) {
				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

@@ -1,10 +1,14 @@
package com.ekexiu.portal.service;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.Collections;
import java.util.List;
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;
import com.ekexiu.portal.pojo.AssedPatent;
import org.jfw.apt.annotation.Autowrie;
import org.jfw.apt.annotation.DefaultValue;
import org.jfw.apt.annotation.Nullable;
@@ -16,15 +20,10 @@ 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;
import com.ekexiu.portal.pojo.AssedPatent;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.Collections;
import java.util.List;
@Path("/ppatent")
public class PpatentServcie {
@@ -193,7 +192,7 @@ public class PpatentServcie {
	
	@Post
	@Path("/agree")
	public void agree(@JdbcConn(true) Connection con,String id,String uid,String uname,@AfterCommit List<Runnable> runs)throws SQLException, JfwBaseException{
	public void agree(@JdbcConn(true) Connection con,String id,String uid,@Nullable 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");
@@ -201,11 +200,13 @@ public class PpatentServcie {
		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("#") &&(!uid.equals(pau.getProfessorId()))){
				this.notifyService.notify(con,pau.getProfessorId(), uid, uname, id,p.getName(), NotifyType.AGREE_PATENT, runs);
		this.patentAgreeDao.insert(con, pa);
		if (uname != null) {
			List<PatentAuthor> authors = this.patentAuthorDao.query(con, id);
			for (PatentAuthor pau : authors) {
				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

@@ -1,10 +1,13 @@
package com.ekexiu.portal.service;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.List;
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;
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.Delete;
import org.jfw.apt.web.annotation.operate.Get;
@@ -15,12 +18,9 @@ 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;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.List;
@Path("/researchArea")
public class ResearchAreaService {
@@ -65,7 +65,7 @@ public class ResearchAreaService {
	@Post
	@Path("/agree")
	public void agree(@JdbcConn(true) Connection con, String targetId, String targetCaption, String opId, String uname, @AfterCommit List<Runnable> runs)
	public void agree(@JdbcConn(true) Connection con, String targetId, String targetCaption, String opId, @Nullable String uname, @AfterCommit List<Runnable> runs)
			throws SQLException {
		if (this.researchAreaDao.inc(con, targetId, targetCaption) > 0) {
@@ -74,8 +74,10 @@ public class ResearchAreaService {
			log.setOpreteProfessorId(opId);
			log.setProfessorId(targetId);
			this.researchAreaLogDao.insert(con, log);
			if (!targetId .equals(opId)) {
				this.notifyService.notify(con, targetId, opId, uname, targetId, targetCaption, NotifyType.AGREE_RESEARCH_AREA, runs);
			if (uname != null) {
				if (!targetId.equals(opId)) {
					this.notifyService.notify(con, targetId, opId, uname, targetId, targetCaption, NotifyType.AGREE_RESEARCH_AREA, runs);
				}
			}
		}
	}

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

@@ -1,18 +1,5 @@
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.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 com.ekexiu.portal.dao.ArticleDao;
import com.ekexiu.portal.dao.ImageDao;
import com.ekexiu.portal.dao.OrgDao;
@@ -26,6 +13,19 @@ import com.ekexiu.portal.po.Article;
import com.ekexiu.portal.po.Resource;
import com.ekexiu.portal.po.Watch;
import com.ekexiu.portal.pojo.EditProfessor;
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.AfterCommit;
import org.jfw.apt.web.annotation.param.JdbcConn;
import org.jfw.util.PageQueryResult;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.List;
@Path("/watch")
public class WatchService {
@@ -124,12 +124,14 @@ public class WatchService {
	@Post
	@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 && (!watch.getWatchObject().equals(watch.getProfessorId()))) {
			this.notifyService.notify(con, watch.getWatchObject(), watch.getProfessorId(), uname, watch.getWatchObject(), watch.getWatchObject(),
					NotifyType.WATCH_USER, runs);
		}
    public String insert(@JdbcConn(true) Connection con, Watch watch, @Nullable final String uname, @AfterCommit List<Runnable> runs) throws SQLException {
        this.watchDao.insert(con, watch);
        if (uname != null) {
            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);
            }
        }
		return watch.getWatchObject();
	}