1.9version

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

@@ -92,6 +92,11 @@ public abstract class ArticleDao {
	@Where("STATUS = '1'")
	public abstract List<Article> queryProPublish(Connection con, String professorId) throws SQLException;
	
	@PageSelect
	@OrderBy(" ORDER BY MODIFY_TIME DESC ")
	@Where("STATUS = '1'")
	public abstract PageQueryResult<Article> pageQueryProPublish(Connection con, String professorId,int pageSize,int pageNo) throws SQLException;
	
	@SelectList
	@OrderBy(" ORDER BY MODIFY_TIME DESC ")
	@Where("STATUS IN ('0','1','2')")
@@ -106,6 +111,11 @@ public abstract class ArticleDao {
	@Where("STATUS = '1'")
	public abstract List<Article> queryOrgPublish(Connection con, String orgId) throws SQLException;
	
	@PageSelect
	@OrderBy(" ORDER BY MODIFY_TIME DESC ")
	@Where("STATUS = '1'")
	public abstract PageQueryResult<Article> pageQueryOrgPublish(Connection con, String orgId,int pageSize,int pageNo) throws SQLException;
	
	@LimitSelect
	@OrderBy(" ORDER BY MODIFY_TIME DESC ")
	public abstract List<Article> queryLimit(Connection con,String orgId,@LessThan String modifyTime,int rows)throws SQLException;

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

@@ -12,6 +12,7 @@ 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.Select;
import org.jfw.apt.orm.annotation.dao.method.SetSentence;
import org.jfw.apt.orm.annotation.dao.method.operator.DeleteWith;
import org.jfw.apt.orm.annotation.dao.method.operator.Insert;
import org.jfw.apt.orm.annotation.dao.method.operator.LimitQuery;
@@ -173,4 +174,14 @@ public abstract class OrgDao {
	@From(Organization.class)
	@DeleteWith
	public abstract int delete(Connection con,String id)throws SQLException;
	
	
	@From(Organization.class)
	@UpdateWith
	public abstract int updateSortNum(Connection con,String id ,@Set long sortNum)throws SQLException;
	@From(Organization.class)
	@UpdateWith
	@SetSentence("PAGE_VIEWS = PAGE_VIEWS + 1")
	public abstract int incPageViews(Connection con,String id)throws SQLException;
	
}

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

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

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

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

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

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

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

@@ -0,0 +1,56 @@
package com.ekexiu.portal.dao;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.List;
import org.jfw.apt.annotation.Nullable;
import org.jfw.apt.orm.annotation.dao.DAO;
import org.jfw.apt.orm.annotation.dao.method.From;
import org.jfw.apt.orm.annotation.dao.method.OrderBy;
import org.jfw.apt.orm.annotation.dao.method.SetSentence;
import org.jfw.apt.orm.annotation.dao.method.operator.PageQuery;
import org.jfw.apt.orm.annotation.dao.method.operator.SelectList;
import org.jfw.apt.orm.annotation.dao.method.operator.SelectOne;
import org.jfw.apt.orm.annotation.dao.method.operator.UpdateWith;
import org.jfw.apt.orm.annotation.dao.param.In;
import org.jfw.apt.orm.annotation.dao.param.Set;
import org.jfw.apt.orm.annotation.dao.param.SqlColumn;
import org.jfw.apt.orm.core.defaultImpl.FixLenStringHandler;
import org.jfw.util.PageQueryResult;
import com.ekexiu.portal.po.Ppaper;
import com.ekexiu.portal.pojo.AssedPaper;
@DAO
public interface PpaperDao {
	@SelectOne
	@Nullable
	Ppaper query(Connection con, String id) throws SQLException;
	@SelectList
	List<Ppaper> query(Connection con, @In String[] id) throws SQLException;
	@UpdateWith
	@From(Ppaper.class)
	int update(Connection con, String id, @Set @Nullable String keywords) throws SQLException;
	@PageQuery
	@OrderBy(" ORDER BY ASS_TIMIE DESC,ID ASC")
	PageQueryResult<AssedPaper> pageQueryWithProfessor(Connection con,
			@SqlColumn(handlerClass = FixLenStringHandler.class, value = { "A.PROFESSOR_ID=?" }) String professId,
			@SqlColumn(handlerClass = FixLenStringHandler.class, value = { "P.NAME LIKE ?" }) String name, int pageSize, int pageNo) throws SQLException;
	@PageQuery
	@OrderBy(" ORDER BY ASS_TIMIE DESC,ID ASC")
	PageQueryResult<AssedPaper> pageQueryWithAuthor(Connection con,
			@SqlColumn(handlerClass = FixLenStringHandler.class, value = { "A.NAME=?" }) String author,
			@SqlColumn(handlerClass = FixLenStringHandler.class, value = { "P.NAME LIKE ?" }) String name, int pageSize, int pageNo) throws SQLException;
	
	@From(Ppaper.class)
	@UpdateWith
	@SetSentence("PAGE_VIEWS = PAGE_VIEWS + 1")
	public abstract int incPageViews(Connection con,String id)throws SQLException;
}

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

@@ -0,0 +1,55 @@
package com.ekexiu.portal.dao;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.List;
import org.jfw.apt.annotation.Nullable;
import org.jfw.apt.orm.annotation.dao.DAO;
import org.jfw.apt.orm.annotation.dao.method.From;
import org.jfw.apt.orm.annotation.dao.method.OrderBy;
import org.jfw.apt.orm.annotation.dao.method.SetSentence;
import org.jfw.apt.orm.annotation.dao.method.operator.PageQuery;
import org.jfw.apt.orm.annotation.dao.method.operator.SelectList;
import org.jfw.apt.orm.annotation.dao.method.operator.SelectOne;
import org.jfw.apt.orm.annotation.dao.method.operator.UpdateWith;
import org.jfw.apt.orm.annotation.dao.param.In;
import org.jfw.apt.orm.annotation.dao.param.Set;
import org.jfw.apt.orm.annotation.dao.param.SqlColumn;
import org.jfw.apt.orm.core.defaultImpl.FixLenStringHandler;
import org.jfw.util.PageQueryResult;
import com.ekexiu.portal.po.Ppatent;
import com.ekexiu.portal.pojo.AssedPatent;
@DAO
public interface PpatentDao {
	@SelectOne
	@Nullable
	Ppatent query(Connection con, String id) throws SQLException;
	@SelectList
	List<Ppatent> query(Connection con, @In String[] id) throws SQLException;
	@UpdateWith
	@From(Ppatent.class)
	int update(Connection con, String id, @Set String keywords) throws SQLException;
	@PageQuery
	@OrderBy(" ORDER BY ASS_TIMIE DESC,ID ASC")
	PageQueryResult<AssedPatent> pageQueryWithProfessor(Connection con,
			@SqlColumn(handlerClass = FixLenStringHandler.class, value = { "A.PROFESSOR_ID=?" }) String professId,
			@SqlColumn(handlerClass = FixLenStringHandler.class, value = { "P.NAME LIKE ?" }) String name, int pageSize, int pageNo) throws SQLException;
	@PageQuery
	@OrderBy(" ORDER BY ASS_TIMIE DESC,ID ASC")
	PageQueryResult<AssedPatent> pageQueryWithAuthor(Connection con,
			@SqlColumn(handlerClass = FixLenStringHandler.class, value = { "A.NAME=?" }) String author,
			@SqlColumn(handlerClass = FixLenStringHandler.class, value = { "P.NAME LIKE ?" }) String name, int pageSize, int pageNo) throws SQLException;
	
	@From(Ppatent.class)
	@UpdateWith
	@SetSentence("PAGE_VIEWS = PAGE_VIEWS + 1")
	public abstract int incPageViews(Connection con,String id)throws SQLException;
}

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

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

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

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

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

@@ -52,6 +52,10 @@ public class TaskJob implements AfterBeanFactory {
		long hkjeTaskTime = hkjeTask - System.currentTimeMillis();
		hkjeTaskTime = hkjeTaskTime > 0 ? hkjeTaskTime : hkjeTaskTime + hkje.getDelayTime();
		service.scheduleAtFixedRate(hkje, hkjeTaskTime, hkje.getDelayTime(), TimeUnit.MILLISECONDS);
		if(hkjeTaskTime>300*1000){
			service.submit(hkje);
		}
		
		service.scheduleAtFixedRate(new Runnable() {
			@Override
			public void run() {

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

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

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

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

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

@@ -0,0 +1,47 @@
package com.ekexiu.portal.po;
import org.jfw.apt.orm.annotation.entry.Column;
import org.jfw.apt.orm.annotation.entry.PrimaryKey;
import org.jfw.apt.orm.annotation.entry.Table;
import org.jfw.apt.orm.core.enums.DE;
@PrimaryKey({"paperId","name"})
@Table
public class PaperAuthor {
	private String paperId;
	private String name;
	private String professorId;
	private String assTime;
	
	@Column(DE.id_32)
	public String getPaperId() {
		return paperId;
	}
	public void setPaperId(String paperId) {
		this.paperId = paperId;
	}
	@Column(DE.text_de)
	public String getName() {
		return name;
	}
	public void setName(String name) {
		this.name = name;
	}
	@Column(DE.id_32)
	public String getProfessorId() {
		return professorId;
	}
	public void setProfessorId(String professorId) {
		this.professorId = professorId;
	}
	@Column(DE.dateTime_de)
	public String getAssTime() {
		return assTime;
	}
	public void setAssTime(String assTime) {
		this.assTime = assTime;
	}
	
	
}

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

@@ -0,0 +1,44 @@
package com.ekexiu.portal.po;
import org.jfw.apt.orm.annotation.entry.Column;
import org.jfw.apt.orm.annotation.entry.PrimaryKey;
import org.jfw.apt.orm.annotation.entry.Table;
import org.jfw.apt.orm.core.enums.DE;
@PrimaryKey({"patentId","name"})
@Table
public class PatentAuthor {
	private String patentId;
	private String name;
	private String professorId;
	private String assTime;
	
	@Column(DE.id_32)
	public String getPatentId() {
		return patentId;
	}
	public void setPatentId(String patentId) {
		this.patentId = patentId;
	}
	@Column(DE.text_de)
	public String getName() {
		return name;
	}
	public void setName(String name) {
		this.name = name;
	}
	@Column(DE.id_32)
	public String getProfessorId() {
		return professorId;
	}
	public void setProfessorId(String professorId) {
		this.professorId = professorId;
	}
	@Column(DE.dateTime_de)
	public String getAssTime() {
		return assTime;
	}
	public void setAssTime(String assTime) {
		this.assTime = assTime;
	}
}

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

@@ -0,0 +1,96 @@
package com.ekexiu.portal.po;
import org.jfw.apt.orm.annotation.entry.Column;
import org.jfw.apt.orm.annotation.entry.PrimaryKey;
import org.jfw.apt.orm.annotation.entry.Table;
import org.jfw.apt.orm.core.enums.DE;
@PrimaryKey("id")
@Table
public class Ppaper {
	private String id; // char(32)  NOT NULL,
	private String name; // text COLLATE "zh_CN.utf8" NOT NULL,
	private long pageViews;// int8 DEFAULT 0 NOT NULL,
	private String cn4periodical;// text,
	private String en4periodical;// text,
	private String periodicaltype;// text,
	private String pubDay;// text,
	private String summary;// text COLLATE "zh_CN.utf8" NOT NULL,
	private String keywords;// text COLLATE "zh_CN.utf8",
	private String ref_param;// text);
	
	@Column(DE.id_32)
	public String getId() {
		return id;
	}
	public void setId(String id) {
		this.id = id;
	}
	@Column(DE.text_de)
	public String getName() {
		return name;
	}
	public void setName(String name) {
		this.name = name;
	}
	@Column(value=DE.long_de)
	public long getPageViews() {
		return pageViews;
	}
	public void setPageViews(long pageViews) {
		this.pageViews = pageViews;
	}
	@Column(DE.Text_de)
	public String getCn4periodical() {
		return cn4periodical;
	}
	public void setCn4periodical(String cn4periodical) {
		this.cn4periodical = cn4periodical;
	}
	@Column(DE.Text_de)
	public String getEn4periodical() {
		return en4periodical;
	}
	public void setEn4periodical(String en4periodical) {
		this.en4periodical = en4periodical;
	}
	@Column(DE.Text_de)
	public String getPeriodicaltype() {
		return periodicaltype;
	}
	public void setPeriodicaltype(String periodicaltype) {
		this.periodicaltype = periodicaltype;
	}
	@Column(DE.text_de)
	public String getPubDay() {
		return pubDay;
	}
	public void setPubDay(String pubDay) {
		this.pubDay = pubDay;
	}
	@Column(DE.text_de)
	public String getSummary() {
		return summary;
	}
	public void setSummary(String summary) {
		this.summary = summary;
	}
	@Column(DE.Text_de)
	public String getKeywords() {
		return keywords;
	}
	public void setKeywords(String keywords) {
		this.keywords = keywords;
	}
	@Column(DE.Text_de)
	public String getRef_param() {
		return ref_param;
	}
	public void setRef_param(String ref_param) {
		this.ref_param = ref_param;
	}
	
	
	
}

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

@@ -0,0 +1,101 @@
package com.ekexiu.portal.po;
import org.jfw.apt.orm.annotation.entry.Column;
import org.jfw.apt.orm.annotation.entry.PrimaryKey;
import org.jfw.apt.orm.annotation.entry.Table;
import org.jfw.apt.orm.core.enums.DE;
@PrimaryKey("id")
@Table
public class Ppatent {
	private String id;// char(32)  NOT NULL,
	private String name;// text COLLATE "zh_CN.utf8" NOT NULL,
	private long pageViews;// int8 DEFAULT 0 NOT NULL,
	private String code;// text  NOT NULL,
	private String  reqCode;// text NOT NULL,
	private String reqPerson;// text COLLATE "zh_CN.utf8",
	private String reqDay;// char(8) NOT NULL,
	private String pubDay;// char(8) NOT NULL,
	private String summary;// text COLLATE "zh_CN.utf8" NOT NULL,
	private String ref_param;// text ,
	private String keywords;// text COLLATE "zh_CN.utf8"
	
	@Column(DE.id_32)
	public String getId() {
		return id;
	}
	public void setId(String id) {
		this.id = id;
	}
	@Column(DE.text_de)
	public String getName() {
		return name;
	}
	public void setName(String name) {
		this.name = name;
	}
	@Column(DE.long_de)
	public long getPageViews() {
		return pageViews;
	}
	public void setPageViews(long pageViews) {
		this.pageViews = pageViews;
	}
	@Column(DE.Text_de)
	public String getCode() {
		return code;
	}
	public void setCode(String code) {
		this.code = code;
	}
	@Column(DE.Text_de)
	public String getReqCode() {
		return reqCode;
	}
	public void setReqCode(String reqCode) {
		this.reqCode = reqCode;
	}
	@Column(DE.Text_de)
	public String getReqPerson() {
		return reqPerson;
	}
	public void setReqPerson(String reqPerson) {
		this.reqPerson = reqPerson;
	}
	@Column(DE.Text_de)
	public String getReqDay() {
		return reqDay;
	}
	public void setReqDay(String reqDay) {
		this.reqDay = reqDay;
	}
	@Column(DE.Text_de)
	public String getPubDay() {
		return pubDay;
	}
	public void setPubDay(String pubDay) {
		this.pubDay = pubDay;
	}
	@Column(DE.text_de)
	public String getSummary() {
		return summary;
	}
	public void setSummary(String summary) {
		this.summary = summary;
	}
	@Column(DE.Text_de)
	public String getRef_param() {
		return ref_param;
	}
	public void setRef_param(String ref_param) {
		this.ref_param = ref_param;
	}
	@Column(DE.Text_de)
	public String getKeywords() {
		return keywords;
	}
	public void setKeywords(String keywords) {
		this.keywords = keywords;
	}
	
}

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

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

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

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

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

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

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

@@ -592,6 +592,12 @@ public class ArticleService {
		return this.articleDao.queryProPublish(con, professorId);
	}
	
	@Get
	@Path("/pqProPublish")
	public PageQueryResult<Article> pageQueryProPublish(@JdbcConn Connection con, String professorId,@DefaultValue("10") int pageSize,@DefaultValue("1") int pageNo) throws SQLException{
		return this.articleDao.pageQueryProPublish(con, professorId,pageSize,pageNo);
	}
	
	@Get
	@Path("/qaForDesk")
	public List<Article> queryForDesk(@JdbcConn Connection con, String professorId) throws SQLException{
@@ -610,6 +616,12 @@ public class ArticleService {
		return this.articleDao.queryOrgPublish(con, orgId);
	}
	
	@Get
	@Path("/pgOrgPublish")
	public PageQueryResult<Article> pageQueryOrgPublish(@JdbcConn Connection con,String orgId,@DefaultValue("10") int pageSize,@DefaultValue("1") int pageNo)throws SQLException{
		return this.articleDao.pageQueryOrgPublish(con, orgId,pageSize,pageNo);
	}
	
	@Get
	@Path("/qlOrg")
	public List<Article> queryLimitOrg(@JdbcConn Connection con,String orgId,@DefaultValue("com.ekexiu.portal.service.ArticleService.MAX_MODIFYTIME") String modifyTime,@DefaultValue("20") int rows)throws SQLException{

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

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

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

@@ -16,6 +16,8 @@ import org.jfw.apt.web.annotation.param.PathVar;
import org.jfw.util.StringUtil;
import com.ekexiu.portal.dao.OrgDao;
import com.ekexiu.portal.dao.OrgRegInfoDao;
import com.ekexiu.portal.po.OrgRegInfo;
import com.ekexiu.portal.po.Organization;
import com.ekexiu.portal.pojo.EditOrganization;
@@ -33,6 +35,19 @@ public class OrgService {
	@Autowrie
	private OrgDao orgDao;
	
	@Autowrie
	private OrgRegInfoDao orgRegInfoDao;
	
	
	
	public OrgRegInfoDao getOrgRegInfoDao() {
		return orgRegInfoDao;
	}
	public void setOrgRegInfoDao(OrgRegInfoDao orgRegInfoDao) {
		this.orgRegInfoDao = orgRegInfoDao;
	}
	public ImageService getImageService() {
		return imageService;
	}
@@ -151,4 +166,16 @@ public class OrgService {
		return id;
	}
	
	@Path("/incPageViews")
	@Post
	public void incPageViews(@JdbcConn(true) Connection con ,String id)throws SQLException{
		this.orgDao.incPageViews(con, id);
	}
	
	@Get
	@Path("/regInfo")
	public OrgRegInfo queryRegInfo(@JdbcConn Connection con,String name) throws SQLException{
		return this.orgRegInfoDao.query(con, name);
	}
	
}

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

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

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

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

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

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

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

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

src/main/resources/database.sql

@@ -1348,3 +1348,104 @@ ALTER TABLE article_pro ADD PRIMARY KEY (article_id, professor_id);
update resource set resource_type='1';
-----begin version 1.9------------------------
ALTER TABLE organization ADD COLUMN addr  text COLLATE "zh_CN.utf8";
COMMENT ON COLUMN organization.addr IS '企为地址';
ALTER TABLE organization ADD COLUMN email  text;
COMMENT ON COLUMN organization.email IS '联系邮箱';
ALTER TABLE organization ADD COLUMN contact_num  text;
COMMENT ON COLUMN organization.contact_num IS '联系电话';
ALTER TABLE organization ADD COLUMN field_of_customer  text  COLLATE "zh_CN.utf8";
COMMENT ON COLUMN organization.field_of_customer IS '客户领域';
ALTER TABLE organization ADD COLUMN field_of_supplier  text  COLLATE "zh_CN.utf8";
COMMENT ON COLUMN organization.field_of_supplier IS '供应商领域';
ALTER TABLE organization ADD COLUMN sort_num  int8 default 0 not null;
COMMENT ON COLUMN organization.sort_num IS '排序值';
ALTER TABLE organization ADD COLUMN page_views  int8 default 0 not null;
COMMENT ON COLUMN organization.page_views IS '浏览量';
COMMENT ON COLUMN watch.watch_type IS '关注类型(专家-1，资源-2，3-文章,4-专利 ，5-论文)';
CREATE TABLE ppatent (
id char(32)  NOT NULL,
name text COLLATE "zh_CN.utf8" NOT NULL,
page_views int8 DEFAULT 0 NOT NULL,
code text  NOT NULL,
req_code text NOT NULL,
req_person text COLLATE "zh_CN.utf8",
req_day char(8) NOT NULL,
pub_day char(8) NOT NULL,
summary text COLLATE "zh_CN.utf8" NOT NULL,
ref_param text ,
keywords text COLLATE "zh_CN.utf8"
);
COMMENT ON COLUMN ppatent.name IS '名称';
COMMENT ON COLUMN ppatent.page_views IS '浏览量';
COMMENT ON COLUMN ppatent.code IS '专利号';
COMMENT ON COLUMN ppatent.req_code IS '申请号';
COMMENT ON COLUMN ppatent.req_person IS '申请人';
COMMENT ON COLUMN ppatent.summary IS '摘要';
COMMENT ON COLUMN ppatent.keywords IS '关键词';
CREATE UNIQUE INDEX ppatent_pkey ON ppatent USING btree (id);
ALTER TABLE ppatent ADD PRIMARY KEY (id);
CREATE TABLE patent_author (
patent_id char(32) NOT NULL,
professor_id char(32) DEFAULT '################################'::bpchar NOT NULL,
name text COLLATE "zh_CN.utf8" NOT NULL,
ass_time char(14) DEFAULT '00010101010101'::bpchar NOT NULL);
COMMENT ON COLUMN patent_author.patent_id IS '专利ID';
COMMENT ON COLUMN patent_author.professor_id IS '专家id(=32个#时，还没有关专家)';
COMMENT ON COLUMN patent_author.name IS '作者姓名';
COMMENT ON COLUMN patent_author.ass_time IS '关联专家时间';
CREATE UNIQUE INDEX patent_author_pkey ON patent_author USING btree (patent_id,name COLLATE "zh_CN.utf8");
ALTER TABLE patent_author ADD PRIMARY KEY (patent_id,name);
CREATE TABLE ppaper (
id char(32)  NOT NULL,
name text COLLATE "zh_CN.utf8" NOT NULL,
page_views int8 DEFAULT 0 NOT NULL,
cn4periodical text,
en4periodical text,
periodicaltype text,
pub_day text,
summary text COLLATE "zh_CN.utf8" NOT NULL,
keywords text COLLATE "zh_CN.utf8",
ref_param text);
COMMENT ON COLUMN ppaper.name IS '名称';
COMMENT ON COLUMN ppaper.page_views IS '浏览量';
COMMENT ON COLUMN ppaper.cn4periodical IS '期刊中文名';
COMMENT ON COLUMN ppaper.en4periodical IS '期刊英文名';
COMMENT ON COLUMN ppaper.pub_day IS '发表期数';
COMMENT ON COLUMN ppaper.summary IS '摘要';
COMMENT ON COLUMN ppaper.keywords IS '关键词';
CREATE UNIQUE INDEX ppaper_pkey ON ppaper USING btree (id);
ALTER TABLE ppaper ADD PRIMARY KEY (id);
CREATE TABLE paper_author (
paper_id char(32) NOT NULL,
professor_id char(32) DEFAULT '################################'::bpchar NOT NULL,
name text COLLATE "zh_CN.utf8" NOT NULL,
ass_time char(14) DEFAULT '00010101010101'::bpchar NOT NULL);
COMMENT ON COLUMN paper_author.paper_id IS '专利ID';
COMMENT ON COLUMN paper_author.professor_id IS '专家id(=32个#时，还没有关专家)';
COMMENT ON COLUMN paper_author.name IS '作者姓名';
COMMENT ON COLUMN paper_author.ass_time IS '关联专家时间';
CREATE UNIQUE INDEX paper_author_pkey ON paper_author USING btree (paper_id,name COLLATE "zh_CN.utf8");
ALTER TABLE paper_author ADD PRIMARY KEY (paper_id,name);
update organization set org_type = null;