Merge branch 'dev' of http://www.ekexiu.com:3000/jiapeng/portal-web.git

into dev

src/main/java/com/ekexiu/portal/platform/PlatformInfo.java

@@ -34,7 +34,7 @@ public class PlatformInfo {
	/**
	 * 联系邮箱
	 */
	private String linkeamil;
	private String linkemail;
	/**
	 * 省
	 */
@@ -98,11 +98,11 @@ public class PlatformInfo {
		this.linkphone = linkphone;
	}
	@Column(DE.text_de)
	public String getLinkeamil() {
		return linkeamil;
	public String getLinkemail() {
		return linkemail;
	}
	public void setLinkeamil(String linkeamil) {
		this.linkeamil = linkeamil;
	public void setLinkemail(String linkemail) {
		this.linkemail = linkemail;
	}
	@Column(DE.Text_de)
	public String getProvince() {

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

@@ -865,21 +865,21 @@ public class ArticleService {
	@Get
	@Path("/qaPro")
	public List<Article> queryPro(@JdbcConn Connection con, String professorId) throws SQLException {
		return this.articleDao.queryPro(con, professorId);
	public List<Article> queryPro(@JdbcConn Connection con, String ownerId) throws SQLException {
		return this.articleDao.queryPro(con, ownerId);
	}
	@Get
	@Path("/qaProPublish")
	public List<Article> queryProPublish(@JdbcConn Connection con, String professorId) throws SQLException {
		return this.articleDao.queryProPublish(con, professorId);
	public List<Article> queryProPublish(@JdbcConn Connection con, String ownerId) throws SQLException {
		return this.articleDao.queryProPublish(con, ownerId);
	}
	@Get
	@Path("/pqProPublish")
	public PageQueryResult<Article> pageQueryProPublish(@JdbcConn Connection con, String professorId, @DefaultValue("10") int pageSize,
	public PageQueryResult<Article> pageQueryProPublish(@JdbcConn Connection con, String ownerId, @DefaultValue("10") int pageSize,
			@DefaultValue("1") int pageNo) throws SQLException {
		return this.articleDao.pageQueryProPublish(con, professorId, pageSize, pageNo);
		return this.articleDao.pageQueryProPublish(con, ownerId, pageSize, pageNo);
	}
	@Get
@@ -908,34 +908,34 @@ public class ArticleService {
	@Get
	@Path("/qaForDesk")
	public List<Article> queryForDesk(@JdbcConn Connection con, String professorId) throws SQLException {
		return this.articleDao.queryForDesk(con, professorId);
	public List<Article> queryForDesk(@JdbcConn Connection con, String ownerId) throws SQLException {
		return this.articleDao.queryForDesk(con, ownerId);
	}
	@Get
	@Path("/qaOrg")
	public List<Article> queryOrg(@JdbcConn Connection con, String onergId) throws SQLException {
		return this.articleDao.queryOrg(con, onergId);
	public List<Article> queryOrg(@JdbcConn Connection con, String ownenerId) throws SQLException {
		return this.articleDao.queryOrg(con, ownenerId);
	}
	@Get
	@Path("/qaOrgPublish")
	public List<Article> queryOrgPublish(@JdbcConn Connection con, String onergId) throws SQLException {
		return this.articleDao.queryOrgPublish(con, onergId);
	public List<Article> queryOrgPublish(@JdbcConn Connection con, String ownenerId) throws SQLException {
		return this.articleDao.queryOrgPublish(con, ownenerId);
	}
	@Get
	@Path("/pqOrgPublish")
	public PageQueryResult<Article> pageQueryOrgPublish(@JdbcConn Connection con, String onergId, @DefaultValue("10") int pageSize, @DefaultValue("1") int pageNo)
	public PageQueryResult<Article> pageQueryOrgPublish(@JdbcConn Connection con, String ownenerId, @DefaultValue("10") int pageSize, @DefaultValue("1") int pageNo)
			throws SQLException {
		return this.articleDao.pageQueryOrgPublish(con, onergId, pageSize, pageNo);
		return this.articleDao.pageQueryOrgPublish(con, ownenerId, pageSize, pageNo);
	}
	@Get
	@Path("/qlOrg")
	public List<Article> queryLimitOrg(@JdbcConn Connection con, String onergId,
	public List<Article> queryLimitOrg(@JdbcConn Connection con, String ownenerId,
			@DefaultValue("com.ekexiu.portal.service.ArticleService.MAX_MODIFYTIME") String modifyTime, @DefaultValue("20") int rows) throws SQLException {
		return this.articleDao.queryLimit(con, onergId, modifyTime, rows);
		return this.articleDao.queryLimit(con, ownenerId, modifyTime, rows);
	}
	@Get

src/main/resources/database.sql

@@ -2274,10 +2274,10 @@ ALTER TABLE PLATFORM_USER ADD UNIQUE (EMAIL);
ALTER TABLE PLATFORM_USER ADD UNIQUE (PHONE);
COMMENT ON TABLE PLATFORM_USER is '平台用户表';
COMMENT ON COLUMN PLATFORM.EMAIL is '登录邮箱';
COMMENT ON COLUMN PLATFORM.PHONE is '登录手机号（未户用）';
COMMENT ON COLUMN PLATFORM.PASSWD is '登录密码';
COMMENT ON COLUMN PLATFORM.PHONE is '状态 1：启用  0：未启用';
COMMENT ON COLUMN PLATFORM_USER.EMAIL is '登录邮箱';
COMMENT ON COLUMN PLATFORM_USER.PHONE is '登录手机号（未户用）';
COMMENT ON COLUMN PLATFORM_USER.PASSWD is '登录密码';
COMMENT ON COLUMN PLATFORM_USER.PHONE is '状态 1：启用  0：未启用';
CREATE TABLE PLATFORM_INFO (
	ID CHAR(10) NOT NULL,
@@ -2285,7 +2285,7 @@ CREATE TABLE PLATFORM_INFO (
	LOGO TEXT,
	LINKMAN TEXT NOT NULL,
	LINKPHONE TEXT NOT NULL,
	LINKEAMIL TEXT NOT NULL,
	LINKEMAIL TEXT NOT NULL,
	PROVINCE TEXT,
	CITY TEXT,
	ADDR TEXT,
@@ -2314,7 +2314,7 @@ COMMENT ON COLUMN PLATFORM_INFO.DESCP is '平台介绍';
 	PID TEXT NOT NULL,
 	AID TEXT NOT NULL,
 	CREATE_TIME CHAR(14) NOT NULL);
ALTER TABLE REFERENCED_ARTICLE ADD PRIMARY KEY (PID,OID);
ALTER TABLE REFERENCED_ARTICLE ADD PRIMARY KEY (PID,AID);
COMMENT ON TABLE REFERENCED_ARTICLE is '企业动态表';
COMMENT ON COLUMN REFERENCED_ARTICLE.PID is '平台ID';
COMMENT ON COLUMN REFERENCED_ARTICLE.AID is '文章ID';
@@ -2346,7 +2346,7 @@ COMMENT ON COLUMN BUTTED_ORG.CREATE_TIME is '对接时间';
 	PID TEXT NOT NULL,
 	UID TEXT NOT NULL,
 	CREATE_TIME CHAR(14) NOT NULL);
ALTER TABLE BUTTED_PROFESSOR ADD PRIMARY KEY (PID,OID);
ALTER TABLE BUTTED_PROFESSOR ADD PRIMARY KEY (PID,UID);
COMMENT ON TABLE BUTTED_PROFESSOR is '对接的平台专家表';
COMMENT ON COLUMN BUTTED_PROFESSOR.PID is '平台ID';
COMMENT ON COLUMN BUTTED_PROFESSOR.UID is '对接的专家ID';