1

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

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

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

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

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

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

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

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

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

@@ -828,7 +828,7 @@ public class ArticleService {
	@Get
	@Path("/ralateArticles")
	public List<Article> ralateArticles(@JdbcConn Connection con,@Nullable String[] keys,@Nullable String professorId,
			@Nullable String orgId,String articleId,@DefaultValue("10") int rows)throws SQLException{
			@Nullable String orgId,String articleId,@DefaultValue("5") int rows)throws SQLException{
		String[] ids = this.articleDao.queryArticleIdWithSameKeyWord(con, articleId, rows);
		if(ids!=null){
			return this.articleDao.query(con,ids);

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

@@ -266,7 +266,7 @@ public class OrgService {
	
	@Get
	@Path("/ralateOrgs")
	public List<EditOrganization> ralateArticles(@JdbcConn Connection con,String orgId,@DefaultValue("10") int rows)throws SQLException{
	public List<EditOrganization> ralateArticles(@JdbcConn Connection con,String orgId,@DefaultValue("5") int rows)throws SQLException{
		String[] ids = this.orgDao.queryOrgIdWithSameKeyWord(con, orgId, rows);
		if(ids!=null){
			List<EditOrganization> ret = this.orgDao.query(con,ids);

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

@@ -14,11 +14,12 @@ import org.jfw.apt.web.annotation.operate.Post;
import org.jfw.apt.web.annotation.param.JdbcConn;
import org.jfw.util.PageQueryResult;
import com.ekexiu.portal.dao.PaperAgreeDao;
import com.ekexiu.portal.dao.PaperAuthorDao;
import com.ekexiu.portal.dao.PpaperDao;
import com.ekexiu.portal.po.PaperAgree;
import com.ekexiu.portal.po.PaperAuthor;
import com.ekexiu.portal.po.Ppaper;
import com.ekexiu.portal.po.Resource;
import com.ekexiu.portal.pojo.AssedPaper;
@Path("/ppaper")
@@ -32,8 +33,20 @@ public class PpaperService {
	@Autowrie
	private KeyWordService keyWordService;
	
	@Autowrie
	private PaperAgreeDao paperAgreeDao;
	
	
	
	public PaperAgreeDao getPaperAgreeDao() {
		return paperAgreeDao;
	}
	public void setPaperAgreeDao(PaperAgreeDao paperAgreeDao) {
		this.paperAgreeDao = paperAgreeDao;
	}
	public KeyWordService getKeyWordService() {
		return keyWordService;
	}
@@ -161,11 +174,38 @@ public class PpaperService {
	}
	@Get
	@Path("/ralatePapers")
	public List<Ppaper> ralatePapers(@JdbcConn Connection con,String paperId,@DefaultValue("10") 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);
		}
		return Collections.<Ppaper>emptyList();
	}
	
	
	@Post
	@Path("/agree")
	public void agree(@JdbcConn(true) Connection con,String id,String uid)throws SQLException{
		PaperAgree pa = new PaperAgree();
		pa.setOpId(uid);
		pa.setPaperId(id);
		this.paperAgreeDao.insert(con, pa);		
	}
	
	@Post
	@Path("/unAgree")
	public void unAgree(@JdbcConn(true) Connection con,String id,String uid)throws SQLException{
		this.paperAgreeDao.delete(con,uid, id);
	}
	
	@Get
	@Path("/agree")
	public boolean hasAgree(@JdbcConn(false) Connection con,String id,String uid)throws SQLException{
		return null!= this.paperAgreeDao.query(con,uid, id);
	}
	@Get
	@Path("/agreeCount")
	public int agreeCount(@JdbcConn(false) Connection con,String id)throws SQLException{
		return this.paperAgreeDao.query(con,id);
	}
}

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

@@ -14,10 +14,11 @@ 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.PatentAgreeDao;
import com.ekexiu.portal.dao.PatentAuthorDao;
import com.ekexiu.portal.dao.PpatentDao;
import com.ekexiu.portal.po.PatentAgree;
import com.ekexiu.portal.po.PatentAuthor;
import com.ekexiu.portal.po.Ppaper;
import com.ekexiu.portal.po.Ppatent;
import com.ekexiu.portal.pojo.AssedPatent;
@@ -32,8 +33,19 @@ public class PpatentServcie {
	@Autowrie
	private KeyWordService keyWordService;
	
	@Autowrie
	private PatentAgreeDao patentAgreeDao;
	
	
	public PatentAgreeDao getPatentAgreeDao() {
		return patentAgreeDao;
	}
	public void setPatentAgreeDao(PatentAgreeDao patentAgreeDao) {
		this.patentAgreeDao = patentAgreeDao;
	}
	public KeyWordService getKeyWordService() {
		return keyWordService;
	}
@@ -155,12 +167,38 @@ public class PpatentServcie {
		return this.ppatentDao.query(con,id);
	}
	@Get
	@Path("/ralatePatent")
	public List<Ppatent> ralatePatents(@JdbcConn Connection con,String patentId,@DefaultValue("10") int rows)throws SQLException{
	@Path("/ralatePatents")
	public List<Ppatent> ralatePatents(@JdbcConn Connection con,String patentId,@DefaultValue("5") int rows)throws SQLException{
		String[] ids = this.ppatentDao.queryPatentIdWithSameKeyWord(con, patentId, rows);
		if(ids!=null){
			return this.ppatentDao.query(con,ids);
		}
		return Collections.<Ppatent>emptyList();
	}
	
	@Post
	@Path("/agree")
	public void agree(@JdbcConn(true) Connection con,String id,String uid)throws SQLException{
		PatentAgree pa = new PatentAgree();
		pa.setOpId(uid);
		pa.setPatentId(id);
		this.patentAgreeDao.insert(con, pa);		
	}
	
	@Post
	@Path("/unAgree")
	public void unAgree(@JdbcConn(true) Connection con,String id,String uid)throws SQLException{
		this.patentAgreeDao.delete(con,uid, id);
	}
	
	@Get
	@Path("/agree")
	public boolean hasAgree(@JdbcConn(false) Connection con,String id,String uid)throws SQLException{
		return null!= this.patentAgreeDao.query(con,uid, id);
	}
	@Get
	@Path("/agreeCount")
	public int agreeCount(@JdbcConn(false) Connection con,String id)throws SQLException{
		return this.patentAgreeDao.query(con,id);
	}
}

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

@@ -741,14 +741,18 @@ public class ProfessorService {
	
	@Get
	@Path("/ralateProfessors")
	public List<Professor> ralateArticles(@JdbcConn Connection con,String professorId,@DefaultValue("10") int rows)throws SQLException{
	public List<Professor> ralateArticles(@JdbcConn Connection con,String professorId,@DefaultValue("5") int rows)throws SQLException{
		String[] ids = this.professorDao.queryProfessorIdWithSameKeyWord(con, professorId, rows);
		if(ids!=null){
			return this.professorDao.query(con,ids);
			 List<Professor> ret = this.professorDao.query(con,ids);
			 return ret;
		}
		return Collections.<Professor>emptyList();
	}
	
//	
//	
//	@Get
//	@Path("/articleRef")
	public static void main(String[] args) throws Exception {
		// Connection con =

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

@@ -4,7 +4,6 @@ import java.io.IOException;
import java.sql.Connection;
import java.sql.SQLException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
import java.util.List;
@@ -998,7 +997,11 @@ public class ResourceService {
	public List<Resource> ralateResources(@JdbcConn Connection con,String resourceId,@DefaultValue("5") int rows)throws SQLException{
		String[] ids = this.resourceDao.queryResourceIdWithSameKeyWord(con, resourceId, rows);
		if(ids!=null){
			return this.resourceDao.query(con,ids);
			List<Resource> ret = this.resourceDao.query(con,ids);
			for(Resource res:ret){
				res.setImages(this.imageDao.queryRes(con, res.getResourceId()));
			}
			return ret;
		}
		return Collections.<Resource>emptyList();
	}

src/main/resources/database.sql

@@ -1558,6 +1558,28 @@ comment on column leave_word.category is '留言分类  1： 文章  2：论文
ALTER TABLE leave_word RENAME article_id TO obj_id;
comment on column leave_word.obj_id is '留言对象ID';
CREATE TABLE paper_agree (
	op_id char(32) NOT NULL,
	paper_id char(32) NOT NULL,
	create_time char(14) NOT NULL
);
COMMENT ON TABLE paper_agree IS '论文点赞表';
COMMENT ON COLUMN paper_agree.op_id IS '点赞人的ID';
COMMENT ON COLUMN paper_agree.paper_id IS '被点赞的论文ID';
COMMENT ON COLUMN paper_agree.create_time IS '点赞时间';
CREATE TABLE patent_agree (
	op_id char(32) NOT NULL,
	patent_id char(32) NOT NULL,
	create_time char(14) NOT NULL
);
COMMENT ON TABLE patent_agree IS '专利点赞表';
COMMENT ON COLUMN patent_agree.op_id IS '点赞人的ID';
COMMENT ON COLUMN patent_agree.patent_id IS '被点赞的专利ID';
COMMENT ON COLUMN patent_agree.create_time IS '点赞时间';
ALTER TABLE patent_agree ADD PRIMARY KEY (op_id,patent_id);
ALTER TABLE paper_agree ADD PRIMARY KEY (op_id,paper_id);