Merge branch 'dev' of http://121.42.53.174:3000/jiapeng/portal-web into dev

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

@@ -54,11 +54,11 @@ public abstract class ArticleDao {
	public abstract int update(Connection con, Article article) throws SQLException;
	@Insert
	public abstract int insert(Connection con,ArticleWare ware)throws SQLException;
	public abstract int insert(Connection con, ArticleWare ware) throws SQLException;
	@DeleteWith
	@From(ArticleWare.class)
	public abstract int deleteWare(Connection con,String id)throws SQLException;
	public abstract int deleteWare(Connection con, String id) throws SQLException;
	@UpdateWith
	@From(Article.class)
@@ -122,23 +122,61 @@ public abstract class ArticleDao {
	@Where("STATUS = '1' AND ARTICLE_TYPE = '1'")
	public abstract PageQueryResult<Article> pageQueryProPublish(Connection con, String ownerId, int pageSize, int pageNo) throws SQLException;
	//@LimitSelect
	//@Exclude("articleContent")
	//@OrderBy(cols = {@LimitColumn(value = "publishTime", asc = false), @LimitColumn(value = "shareId",asc = false, handlerClass = LongHandler.class)}, value = "")
	//@Where("STATUS = '1'")
	//public abstract List<Article> proPublish(Connection con, String professorId, String publishTime, long shareId, int rows)throws SQLException;
    //
	//@LimitSelect
	//@Exclude("articleContent")
	//@OrderBy(cols = {@LimitColumn(value = "publishTime", asc = false), @LimitColumn(value = "shareId",asc = false, handlerClass = LongHandler.class)}, value = "")
	//@Where("STATUS = '1'")
	//public abstract List<Article> orgPublish(Connection con, String orgId, String publishTime, long shareId, int rows)throws SQLException;
	// @LimitSelect
	// @Exclude("articleContent")
	// @OrderBy(cols = {@LimitColumn(value = "publishTime", asc = false),
	// @LimitColumn(value = "shareId",asc = false, handlerClass =
	// LongHandler.class)}, value = "")
	// @Where("STATUS = '1'")
	// public abstract List<Article> proPublish(Connection con, String
	// professorId, String publishTime, long shareId, int rows)throws
	// SQLException;
	//
	// @LimitSelect
	// @Exclude("articleContent")
	// @OrderBy(cols = {@LimitColumn(value = "publishTime", asc = false),
	// @LimitColumn(value = "shareId",asc = false, handlerClass =
	// LongHandler.class)}, value = "")
	// @Where("STATUS = '1'")
	// public abstract List<Article> orgPublish(Connection con, String orgId,
	// String publishTime, long shareId, int rows)throws SQLException;
	@LimitSelect
	@Exclude("articleContent")
	@OrderBy(cols = { @LimitColumn(value = "publishTime", asc = false),
			@LimitColumn(value = "shareId", asc = false, handlerClass = LongHandler.class) }, value = "")
	@Where("STATUS = '1'")
	public abstract List<Article> publish(Connection con, String articleType, String ownerId, String publishTime, long shareId, int rows) throws SQLException;
	@LimitSelect
	@Exclude("articleContent")
	@OrderBy(cols = {@LimitColumn(value = "publishTime", asc = false), @LimitColumn(value = "shareId",asc = false, handlerClass = LongHandler.class)}, value = "")
	@OrderBy(cols = { @LimitColumn(value = "publishTime", asc = false),
			@LimitColumn(value = "shareId", asc = false, handlerClass = LongHandler.class) }, value = "")
	@Where("STATUS = '1'")
	public abstract List<Article> publishInPlatform(Connection con,
			@SqlColumn(handlerClass = StringHandler.class, value = { "ARTICLE_ID IN (SELECT AID FROM REFERENCED_ARTICLE WHERE PID=?" }) String pid,
			String publishTime, long shareId, int rows) throws SQLException;
	@PageSelect
	@Exclude("articleContent")
	@OrderBy(value = "ORDER BY PUBLISH_TIME DESC")
	@Where("STATUS = '1'")
	public abstract PageQueryResult<Article> publishInPlatform(Connection con,
			@SqlColumn(handlerClass = StringHandler.class, value = { "ARTICLE_ID IN (SELECT AID FROM REFERENCED_ARTICLE WHERE PID=?" }) String pid,
			@Nullable @GroupSqlColumn(handlerClass = StringHandler.class, value = { "ARTICLE_TITLE LIKE ?",
					"OWNER_ID IN (SELECT ID FROM ORGANIZATION WHERE NAME LIKE ? OR FOR_SHORT LIKE)" }, additional = 1, isAnd = false) String key,
			int pageSize, int pageNo) throws SQLException;
	@PageSelect
	@Exclude("articleContent")
	@OrderBy(value = "ORDER BY PUBLISH_TIME DESC")
	@Where("STATUS = '1'")
	public abstract List<Article> publish(Connection con,String articleType, String ownerId, String publishTime, long shareId, int rows)throws SQLException;
	public abstract PageQueryResult<Article> publishNotInPlatform(Connection con,
			@GroupSqlColumn(handlerClass = StringHandler.class, value = { "ARTICLE_ID NOT IN (SELECT AID FROM REFERENCED_ARTICLE WHERE PID=?",
					"ARTICLE_TYPE='2' AND OWNER_ID IN (SELECT OID FROM RESIDENT_ORG WHERE PID=?)" }, isAnd = true) String pid,
			@Nullable @GroupSqlColumn(handlerClass = StringHandler.class, value = { "ARTICLE_TITLE LIKE ?",
					"OWNER_ID IN (SELECT ID FROM ORGANIZATION WHERE NAME LIKE ? OR FOR_SHORT LIKE)" }, additional = 1, isAnd = false) String key,
			int pageSize, int pageNo) throws SQLException;
	@Exclude("articleContent")
	@SelectList
@@ -175,178 +213,7 @@ public abstract class ArticleDao {
	public abstract Article queryOne(Connection con, String articleId) throws SQLException;
	@SelectList
	public abstract List<ArticleWare> queryWares(Connection con,String id)throws SQLException;
	public List<Article> queryByPageViews(Connection con, String articleId, int rows) throws SQLException {
		int index = 1;
		boolean hasArticleId = null != articleId;
		StringBuilder sql = new StringBuilder();
		sql.append(
				"SELECT ARTICLE_ID,OWNER_ID,ARTICLE_TITLE,'',SUBJECT,PUBLISH_TIME,ARTICLE_IMG,ARTICLE_TYPE,ARTICLE_AGREE,PAGE_VIEWS,STATUS,CREATE_TIME,MODIFY_TIME,SHARE_ID,COL_NUM FROM ARTICLE");
		sql.append(" WHERE STATUS = '1'");
		if (hasArticleId) {
			sql.append(" AND ARTICLE_ID != ?");
		}
		sql.append(" ORDER BY PAGE_VIEWS DESC");
		sql.append(" LIMIT ").append(rows);
		PreparedStatement ps = con.prepareStatement(sql.toString());
		try {
			if (hasArticleId) {
				ps.setString(index++, articleId);
			}
			ResultSet rs = ps.executeQuery();
			try {
				List<Article> articles = new ArrayList<Article>();
				while (rs.next()) {
					Article article = new Article();
					article.setArticleId(rs.getString(1));
					String proId = rs.getString(2);
					if (rs.wasNull()) {
						proId = null;
					}
					article.setOwnerId(proId);
					article.setArticleTitle(rs.getString(3));
					String articleContent = rs.getString(4);
					if (rs.wasNull()) {
						articleContent = null;
					}
					article.setArticleContent(articleContent);
					String subject = rs.getString(5);
					if (rs.wasNull()) {
						subject = null;
					}
					article.setSubject(subject);
					String publishTime = rs.getString(6);
					if (rs.wasNull()) {
						publishTime = null;
					}
					article.setPublishTime(publishTime);
					String articleImg = rs.getString(7);
					if (rs.wasNull()) {
						articleImg = null;
					}
					article.setArticleImg(articleImg);
					String articleType = rs.getString(8);
					if (rs.wasNull()) {
						articleType = null;
					}
					article.setArticleType(articleType);
					article.setArticleAgree(rs.getInt(9));
					article.setPageViews(rs.getInt(10));
					String status = rs.getString(11);
					if (rs.wasNull()) {
						status = null;
					}
					article.setStatus(status);
					article.setCreateTime(rs.getString(12));
					article.setModifyTime(rs.getString(13));
					article.setShareId(rs.getLong(14));
					article.setColNum(rs.getInt(15));
					articles.add(article);
				}
				return articles;
			} finally {
				try {
					rs.close();
				} catch (Exception e1) {
				}
			}
		} finally {
			try {
				ps.close();
			} catch (Exception e2) {
			}
		}
	}
	public List<Article> queryByAuthor(Connection con, String ownerId, String articleId, int rows) throws SQLException {
		int index = 1;
		boolean hasOwnerId = null != ownerId;
		boolean hasArticleId = null != articleId;
		StringBuilder sql = new StringBuilder();
		sql.append(
				"SELECT ARTICLE_ID,OWNER_ID,ARTICLE_TITLE,'',SUBJECT,PUBLISH_TIME,ARTICLE_IMG,ARTICLE_TYPE,ARTICLE_AGREE,PAGE_VIEWS,STATUS,CREATE_TIME,MODIFY_TIME,SHARE_ID,COL_NUM FROM ARTICLE");
		sql.append(" WHERE STATUS = '1'");
		if (hasOwnerId) {
			sql.append(" AND OWNER_ID = ?");
		}
		if (hasArticleId) {
			sql.append(" AND ARTICLE_ID != ?");
		}
		sql.append(" ORDER BY PUBLISH_TIME DESC");
		sql.append(" LIMIT ").append(rows);
		PreparedStatement ps = con.prepareStatement(sql.toString());
		try {
			if (hasOwnerId) {
				ps.setString(index++, ownerId);
			}
			if (hasArticleId) {
				ps.setString(index++, articleId);
			}
			ResultSet rs = ps.executeQuery();
			try {
				List<Article> articles = new ArrayList<Article>();
				while (rs.next()) {
					Article article = new Article();
					article.setArticleId(rs.getString(1));
					String proId = rs.getString(2);
					if (rs.wasNull()) {
						proId = null;
					}
					article.setOwnerId(proId);
					article.setArticleTitle(rs.getString(3));
					String articleContent = rs.getString(4);
					if (rs.wasNull()) {
						articleContent = null;
					}
					article.setArticleContent(articleContent);
					String subject = rs.getString(5);
					if (rs.wasNull()) {
						subject = null;
					}
					article.setSubject(subject);
					String publishTime = rs.getString(6);
					if (rs.wasNull()) {
						publishTime = null;
					}
					article.setPublishTime(publishTime);
					String articleImg = rs.getString(7);
					if (rs.wasNull()) {
						articleImg = null;
					}
					article.setArticleImg(articleImg);
					String articleType = rs.getString(8);
					if (rs.wasNull()) {
						articleType = null;
					}
					article.setArticleType(articleType);
					article.setArticleAgree(rs.getInt(9));
					article.setPageViews(rs.getInt(10));
					String status = rs.getString(11);
					if (rs.wasNull()) {
						status = null;
					}
					article.setStatus(status);
					article.setCreateTime(rs.getString(12));
					article.setModifyTime(rs.getString(13));
					article.setShareId(rs.getLong(14));
					article.setColNum(rs.getInt(15));
					articles.add(article);
				}
				return articles;
			} finally {
				try {
					rs.close();
				} catch (Exception e1) {
				}
			}
		} finally {
			try {
				ps.close();
			} catch (Exception e2) {
			}
		}
	}
	public abstract List<ArticleWare> queryWares(Connection con, String id) throws SQLException;
	public String[] queryArticleIdWithSameKeyWord(Connection con, String id, int rows) throws SQLException {
		List<String> ret = new ArrayList<String>();
@@ -505,8 +372,13 @@ public abstract class ArticleDao {
	@LimitSelect
	@Exclude("articleContent")
	@Where("STATUS = '1'")
	@OrderBy(cols = {@LimitColumn(value = "sortNum", asc = false, handlerClass = LongHandler.class), @LimitColumn(value = "publishTime", asc = false), @LimitColumn(value = "articleId", asc = false)}, value = "")
	public abstract List<Article> indexSearch(Connection con,@Nullable @GroupSqlColumn(handlerClass = StringHandler.class, value = {"OWNER_ID IN (SELECT ID FROM PROFESSOR WHERE NAME LIKE ?)", "OWNER_ID IN (SELECT ID FROM ORGANIZATION WHERE NAME LIKE ? OR FOR_SHORT LIKE ?)", "ARTICLE_TITLE LIKE ?", "SUBJECT LIKE ?"}, additional = 1, isAnd = false) String key, long sortNum, String publishTime, String articleId, int rows) throws SQLException;
	@OrderBy(cols = { @LimitColumn(value = "sortNum", asc = false, handlerClass = LongHandler.class), @LimitColumn(value = "publishTime", asc = false),
			@LimitColumn(value = "articleId", asc = false) }, value = "")
	public abstract List<Article> indexSearch(Connection con,
			@Nullable @GroupSqlColumn(handlerClass = StringHandler.class, value = { "OWNER_ID IN (SELECT ID FROM PROFESSOR WHERE NAME LIKE ?)",
					"OWNER_ID IN (SELECT ID FROM ORGANIZATION WHERE NAME LIKE ? OR FOR_SHORT LIKE ?)", "ARTICLE_TITLE LIKE ?",
					"SUBJECT LIKE ?" }, additional = 1, isAnd = false) String key,
			long sortNum, String publishTime, String articleId, int rows) throws SQLException;
	// public PageQueryResult<Article> firstPageQuery(Connection con, String
	// key, int pageSize, int pageNo) throws SQLException {
@@ -682,8 +554,9 @@ public abstract class ArticleDao {
	@Exclude("articleContent")
	@OrderBy(" ORDER BY selfOrderField DESC,SHARE_ID ASC ")
	@Where("STATUS IN ('1','0','2')")
	public abstract PageQueryResult<SelfArticle> queryPageForSelf(Connection con, @Nullable String ownerId,
			@Like @Nullable String articleTitle, int pageSize, int pageNo) throws SQLException;
	public abstract PageQueryResult<SelfArticle> queryPageForSelf(Connection con, String articleType, String ownerId,
			@Nullable @GroupSqlColumn(handlerClass = StringHandler.class, value = { "ARTICLE_TITLE LIKE ?", "SUBJECT LIKE ?" }, isAnd = false) String key,
			int pageSize, int pageNo) throws SQLException;
	public PageQueryResult<FindInfo> queryPage(Connection con, int pageSize, int pageNo) throws SQLException {
		int total = 0;
@@ -891,8 +764,10 @@ public abstract class ArticleDao {
	public abstract List<Article> lasterByPublishTime(Connection con, @GtEq String publishTime, int rows) throws SQLException;
	@LimitSelect
	@OrderBy( " ORDER BY PAGE_VIEWS DESC")
	public abstract List<Article> queryByWareId(Connection con,@SqlColumn(handlerClass = StringHandler.class, value = { "ARTICLE_ID IN (SELECT ID FROM ARTICLE_WARE WHERE WARE =?)" }) String ware,int rows) throws SQLException;
	@OrderBy(" ORDER BY PAGE_VIEWS DESC")
	public abstract List<Article> queryByWareId(Connection con,
			@SqlColumn(handlerClass = StringHandler.class, value = { "ARTICLE_ID IN (SELECT ID FROM ARTICLE_WARE WHERE WARE =?)" }) String ware, int rows)
			throws SQLException;
	@DefaultValue("0")
	@QueryVal

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

@@ -7,32 +7,50 @@ import org.jfw.apt.orm.core.enums.DE;
import com.ekexiu.portal.basepo.CreateTimeSupported;
@PrimaryKey({"pid","oid"})
/**
 * 对接的合作机构
 * 
 * @author Saga
 *
 */
@PrimaryKey({ "pid", "oid" })
@Table
public class ButtedOrg implements CreateTimeSupported {
	/**
	 * 平台ID
	 */
	private String pid;
	/**
	 * 对接的合作机构ID(企业ID)
	 */
	private String oid;
	private String createTime;
	
	@Column(DE.text_de)
	public String getPid() {
		return pid;
	}
	public void setPid(String pid) {
		this.pid = pid;
	}
	@Column(DE.text_de)
	public String getOid() {
		return oid;
	}
	public void setOid(String oid) {
		this.oid = oid;
	}
	public String getCreateTime() {
		return createTime;
	}
	public void setCreateTime(String createTime) {
		this.createTime = createTime;
	}
	
}

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

@@ -0,0 +1,30 @@
package com.ekexiu.portal.platform;
import org.jfw.apt.orm.annotation.entry.CalcColumn;
import org.jfw.apt.orm.annotation.entry.ExtendView;
import org.jfw.apt.orm.core.defaultImpl.StringHandler;
import com.ekexiu.portal.po.Organization;
@ExtendView(fromSentence="ORGANIZATION O INNER JOIN BUTTED_ORG B ON O.ID = B.OID" ,tableAlias="O")
public class ButtedOrgInfo extends Organization{
	
	private String buttedTime;
	private boolean hasOrgLogo;
	public boolean isHasOrgLogo() {
		return hasOrgLogo;
	}
	public void setHasOrgLogo(boolean hasOrgLogo) {
		this.hasOrgLogo = hasOrgLogo;
	}
	@CalcColumn(column="B.CREATE_TIME BUTTE_TIME",handlerClass=StringHandler.class)
	public String getButtedTime() {
		return buttedTime;
	}
	public void setButtedTime(String buttedTime) {
		this.buttedTime = buttedTime;
	}
}

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

@@ -6,11 +6,22 @@ import org.jfw.apt.orm.annotation.entry.Table;
import org.jfw.apt.orm.core.enums.DE;
import com.ekexiu.portal.basepo.CreateTimeSupported;
/**
 * 对接的专家
 * 
 * @author Saga
 *
 */
@PrimaryKey({"pid","uid"})
@Table
public class ButtedProfessor implements CreateTimeSupported {
	/**
	 * 平台ID
	 */
	private String pid;
	/**
	 * 对接的专家ID
	 */
	private String uid;
	private String createTime;
	

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

@@ -0,0 +1,31 @@
package com.ekexiu.portal.platform;
import org.jfw.apt.orm.annotation.entry.CalcColumn;
import org.jfw.apt.orm.annotation.entry.ExtendView;
import org.jfw.apt.orm.core.defaultImpl.StringHandler;
import com.ekexiu.portal.po.Professor;
@ExtendView(fromSentence="PROFESSOR P INNER JOIN BUTTED_ORG B ON P.ID = B.OID" ,tableAlias="P")
public class ButtedProfessorInfo extends Professor {
	private String buttedTime;
	private Integer hasHeadImage;
	
	public Integer getHasHeadImage() {
		return hasHeadImage;
	}
	public void setHasHeadImage(Integer hasHeadImage) {
		this.hasHeadImage = hasHeadImage;
	}
	@CalcColumn(column="B.CREATE_TIME BUTTE_TIME",handlerClass=StringHandler.class)
	public String getButtedTime() {
		return buttedTime;
	}
	public void setButtedTime(String buttedTime) {
		this.buttedTime = buttedTime;
	}
}

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

@@ -6,56 +6,170 @@ 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.Exclude;
import org.jfw.apt.orm.annotation.dao.method.From;
import org.jfw.apt.orm.annotation.dao.method.LimitColumn;
import org.jfw.apt.orm.annotation.dao.method.OrderBy;
import org.jfw.apt.orm.annotation.dao.method.Where;
import org.jfw.apt.orm.annotation.dao.method.operator.Delete;
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;
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.Update;
import org.jfw.apt.orm.annotation.dao.method.operator.UpdateWith;
import org.jfw.apt.orm.annotation.dao.param.Alias;
import org.jfw.apt.orm.annotation.dao.param.GroupSqlColumn;
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.StringHandler;
import org.jfw.util.PageQueryResult;
@DAO
public interface PlatformDao {
	
	@SelectOne
	@Nullable
	@Where("STATE='1'")
	PlatformUser login(Connection con,String email,String passwd)throws SQLException;
	PlatformUser login(Connection con, String email, String passwd) throws SQLException;
	@Nullable
	@SelectOne
	PlatformInfo  queryInfo(Connection con,String id)throws SQLException;
	
	PlatformInfo queryInfo(Connection con, String id) throws SQLException;
	@SelectOne
	@Nullable 
	PlatformUser queryUser(Connection con,String email)throws SQLException;
	
	@Nullable
	PlatformUser queryUser(Connection con, String email) throws SQLException;
	@SelectOne
	@Nullable 
	PlatformUser queryUserById(Connection con,String id)throws SQLException;
	
	@Nullable
	PlatformUser queryUserById(Connection con, String id) throws SQLException;
	@SelectList
	List<PlatformInfo> queryInfos(Connection con,@In String[] id)throws SQLException;
	
	List<PlatformInfo> queryInfos(Connection con, @In String[] id) throws SQLException;
	@UpdateWith
	@From(PlatformUser.class)
	int updatePasswd(Connection con,String id ,@Alias("passwd") String oldpw ,@Set String passwd)throws SQLException;
	
	int updatePasswd(Connection con, String id, @Alias("passwd") String oldpw, @Set String passwd) throws SQLException;
	@UpdateWith
	@From(PlatformUser.class)
	int updatePasswd(Connection con,String id,String email ,@Alias("passwd") String oldpw ,@Set String passwd)throws SQLException;
	
	int updatePasswd(Connection con, String id, String email, @Alias("passwd") String oldpw, @Set String passwd) throws SQLException;
	@UpdateWith
	@From(PlatformUser.class)
	int updateMail(Connection con,String id,@Alias("email") String oldemail ,String passwd ,@Set String email)throws SQLException;
	
	
	int updateMail(Connection con, String id, @Alias("email") String oldemail, String passwd, @Set String email) throws SQLException;
	@Update
	int update(Connection con,PlatformInfo pi)throws SQLException;
	
	int update(Connection con, PlatformInfo pi) throws SQLException;
	@Insert
	int insert(Connection con,PlatformOrg org) throws SQLException;
	int insert(Connection con, PlatformOrg org) throws SQLException;
	@Insert
	int insert(Connection con, ResidentOrg org) throws SQLException;
	@Insert
	int insert(Connection con, ButtedOrg org) throws SQLException;
	@Insert
	int insert(Connection con, ButtedProfessor professor) throws SQLException;
	@Insert
	int insert(Connection con, ReferencedArticle article) throws SQLException;
	@Delete
	int delete(Connection con, ResidentOrg org) throws SQLException;
	@Delete
	int delete(Connection con, ButtedOrg org) throws SQLException;
	@Delete
	int delete(Connection con, ButtedProfessor professor) throws SQLException;
	@Delete
	int delete(Connection con, ReferencedArticle article) throws SQLException;
	@SelectList
	List<ResidentOrg> queryResidentOrgs(Connection con, String pid) throws SQLException;
	@SelectList
	List<ButtedOrg> queryButtedOrgs(Connection con, String pid) throws SQLException;
	@SelectList
	List<ButtedProfessor> queryButtedProfessors(Connection con, String pid) throws SQLException;
	@SelectList
	List<ReferencedArticle> queryReferencedArticles(Connection con, String pid) throws SQLException;
	@SelectOne
	@Nullable
	ResidentOrg queryResidentOrg(Connection con, String pid, String oid) throws SQLException;
	@SelectOne
	@Nullable
	ButtedOrg queryButtedOrg(Connection con, String pid, String oid) throws SQLException;
	@SelectOne
	@Nullable
	ButtedProfessor queryButtedProfessor(Connection con, String pid, String uid) throws SQLException;
	@SelectOne
	@Nullable
	ReferencedArticle queryReferencedArticle(Connection con, String pid, String aid) throws SQLException;
	@DeleteWith
	@From(ResidentOrg.class)
	int deleteResidentOrg(Connection con, String pid, String oid) throws SQLException;
	@DeleteWith
	@From(ButtedOrg.class)
	int deleteButtedOrg(Connection con, String pid, String oid) throws SQLException;
	@DeleteWith
	@From(ButtedProfessor.class)
	int deleteButtedProfessor(Connection con, String pid, String uid) throws SQLException;
	@DeleteWith
	@From(ReferencedArticle.class)
	int deleteReferencedArticle(Connection con, String pid, String aid) throws SQLException;
	@LimitQuery
	@OrderBy(cols = { @LimitColumn(value = "time", column = "R.CREATE_TIME", handlerClass = StringHandler.class, asc = false),
			@LimitColumn(value = "oid", column = "O.ID", asc = false, handlerClass = StringHandler.class) }, value = "")
	@Exclude({ "descp" })
	List<ResidentOrgInfo> queryResientOrgInfo(Connection con, String time, String oid,
			@SqlColumn(handlerClass = StringHandler.class, value = { "R.PID=?" }) String pid,
			@Nullable @GroupSqlColumn(handlerClass = StringHandler.class, isAnd = false, value = { "O.NAME LIKE ?", "O.FOR_SHORT LIKE ?" }) String key,
			int rows) throws SQLException;
	@LimitQuery
	@OrderBy(cols = { @LimitColumn(value = "time", column = "B.CREATE_TIME", handlerClass = StringHandler.class, asc = false),
			@LimitColumn(value = "oid", column = "O.ID", asc = false, handlerClass = StringHandler.class) }, value = "")
	@Exclude({ "descp" })
	List<ButtedOrgInfo> queryButtedOrgInfo(Connection con, String time, String oid,
			@SqlColumn(handlerClass = StringHandler.class, value = { "B.PID=?" }) String pid, int rows) throws SQLException;
	@PageQuery
	@OrderBy(value = "ORDER BY BUTTE_TIME DESC,ID ASC")
	@Exclude({ "descp" })
	PageQueryResult<ButtedOrgInfo> pageQueryButtedOrgInfo(Connection con, @SqlColumn(handlerClass = StringHandler.class, value = { "B.PID=?" }) String pid,
			int pageSize, int pageNo) throws SQLException;
	@LimitQuery
	@OrderBy(cols = { @LimitColumn(value = "time", column = "B.CREATE_TIME", handlerClass = StringHandler.class, asc = false),
			@LimitColumn(value = "uid", column = "P.ID", asc = false, handlerClass = StringHandler.class) }, value = "")
	@Exclude({ "descp" })
	List<ButtedProfessorInfo> queryButtedProfessorInfo(Connection con, String time, String uid,
			@SqlColumn(handlerClass = StringHandler.class, value = { "B.PID=?" }) String pid, int rows) throws SQLException;
	@PageQuery
	@OrderBy(value = "ORDER BY BUTTE_TIME DESC,ID ASC")
	@Exclude({ "descp" })
	PageQueryResult<ButtedProfessorInfo> queryButtedProfessorInfo(Connection con,
			@SqlColumn(handlerClass = StringHandler.class, value = { "B.PID=?" }) String pid, int pageSize, int pageNo) throws SQLException;
}

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

@@ -5,20 +5,59 @@ import org.jfw.apt.orm.annotation.entry.PrimaryKey;
import org.jfw.apt.orm.annotation.entry.Table;
import org.jfw.apt.orm.core.defaultImpl.FixLenStringHandler;
import org.jfw.apt.orm.core.enums.DE;
/**
 * 平台信息表
 * @author Saga
 *
 */
@PrimaryKey("id")
@Table
public class PlatformInfo {
	private String id;
	/**
	 * 平台名称
	 */
	private String name;
	/**
	 * 平台LOGO
	 */
	private String logo;
	/**
	 * 联系人
	 */
	private String linkman;
	/**
	 *联系电话
	 */
	private String linkphone;
	/**
	 * 联系邮箱
	 */
	private String linkeamil;
	/**
	 * 省
	 */
	private String province;
	/**
	 * 市
	 */
	private String city;
	/**
	 * 地址
	 */
	private String addr;
	/**
	 * 主页
	 */
	private String url;
	/**
	 * 面向行业
	 */
	private String industry;
	/**
	 * 平台介绍
	 */
	private String descp;
	private String createTime;
	private String modifyTime;

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

@@ -6,12 +6,23 @@ import org.jfw.apt.orm.annotation.entry.Table;
import org.jfw.apt.orm.core.enums.DE;
import com.ekexiu.portal.basepo.CreateTimeSupported;
/**
 * 平台
 * @author Saga
 *
 */
@PrimaryKey("id")
@Table
public class PlatformOrg implements CreateTimeSupported {
	/**
	 * id
	 */
	private String id;
	/**
	 * 平台ID
	 */
	private String pid;
	private String logo;
	private String name;
	private String email;
	private String addr;
@@ -89,6 +100,13 @@ public class PlatformOrg implements CreateTimeSupported {
	public void setCreateTime(String createTime) {
		this.createTime = createTime;
	}
	@Column(DE.Text_de)
	public String getLogo() {
		return logo;
	}
	public void setLogo(String logo) {
		this.logo = logo;
	}
	
	
}

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

@@ -17,14 +17,18 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
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.method.SetCookie;
import org.jfw.apt.web.annotation.operate.Get;
import org.jfw.apt.web.annotation.operate.Post;
import org.jfw.apt.web.annotation.param.FieldParam;
import org.jfw.apt.web.annotation.param.JdbcConn;
import org.jfw.apt.web.annotation.param.RequestParam;
import org.jfw.apt.web.annotation.param.Upload;
import org.jfw.util.JpgUtil;
import org.jfw.util.PageQueryResult;
import org.jfw.util.StringUtil;
import org.jfw.util.context.JfwAppContext;
import org.jfw.util.exception.JfwBaseException;
@@ -34,6 +38,7 @@ import org.jfw.util.web.fileupload.Item;
import org.jfw.util.web.fileupload.UploadItemIterator;
import com.ekexiu.portal.mail.MailService;
import com.ekexiu.portal.service.ImageService;
@Path("/platform")
public class PlatformService {
@@ -45,8 +50,7 @@ public class PlatformService {
	private String stateCodeWithRestPasswordWithEmail = "MAIL_REST_SC";
	private String templateWithRestPasswordWithEmail = "";
	private String subjectWithRestPasswordWithEmail = "「科袖」平台账户密码找回";
	
	
	private long bindEmailTimeout = 60 * 10;
	private String urlWithBindEmail = "MAIL_REST_URL";
@@ -64,6 +68,17 @@ public class PlatformService {
	private int imgMaxWidth = 70;
	@Autowrie
	private ImageService imageService;
	public ImageService getImageService() {
		return imageService;
	}
	public void setImageService(ImageService imageService) {
		this.imageService = imageService;
	}
	public int getImgMaxWidth() {
		return imgMaxWidth;
	}
@@ -96,13 +111,18 @@ public class PlatformService {
		this.mailService = mailService;
	}
	@SetCookie(checkResultNull = true, path = "/", value = { "plf_user=result.getId()", "plf_email=result.getEmail()",
			"plf_logo=result.getLogo()==null?\"\":result.getLogo()", "plf_name=result.getName()" })
	@Post
	@Path("/login")
	public LoginUserInfo login(@JdbcConn Connection con, String email, String pw) throws JfwBaseException, SQLException {
		LoginUserInfo ret = null;
		PlatformUser pu = this.platformDao.queryUser(con, email);
		if (pu != null) {
			if (pw.equals(pu.getPasswd())) {
			if (!"1".equals(pu.getState())) {
				throw new JfwBaseException(-600004, "user disabled");
			}
			if (StringUtil.md5(pw).equals(pu.getPasswd())) {
				PlatformInfo pi = this.platformDao.queryInfo(con, pu.getId());
				if (pi != null) {
					ret = new LoginUserInfo();
@@ -122,9 +142,9 @@ public class PlatformService {
		return ret;
	}
	@Path("reqResetPw")
	@Path("/reqResetPw")
	@Post
	public void requestResetPasswordWithEmail(@JdbcConn Connection con, String mail, @Nullable String url) throws SQLException, JfwBaseException {
	public void requestResetPasswordWithEmail(@JdbcConn Connection con, String mail,String url) throws SQLException, JfwBaseException {
		PlatformUser pu = this.platformDao.queryUser(con, mail);
		if (pu == null)
			throw new JfwBaseException(-600001, "not found user");
@@ -136,9 +156,7 @@ public class PlatformService {
		final String cachekey = JfwAppContext.cacheObjectAndGenKey(sc);
		Map<String, String> mailParam = new HashMap<String, String>();
		mailParam.put(this.stateCodeWithRestPasswordWithEmail, cachekey);
		if (url != null) {
			mailParam.put(this.urlWithRestPasswordWithEmail, url);
		}
		mailParam.put(this.urlWithRestPasswordWithEmail, url);
		try {
			mailService.sendSimpleMail(mail, this.templateWithRestPasswordWithEmail, mailParam, this.subjectWithRestPasswordWithEmail);
			JfwAppContext.getScheduledExecutorService().schedule(new Runnable() {
@@ -153,12 +171,9 @@ public class PlatformService {
			throw new JfwBaseException(-600002, "mail service error");
		}
	}
	
	
	
	@Post
	@Path("/restpw")
	@Path("/resetpw")
	public void restpw(@JdbcConn(true) Connection con, String code, String pw) throws SQLException, JfwBaseException {
		@SuppressWarnings("unchecked")
		StateCode<String, String> sc = (StateCode<String, String>) JfwAppContext.getCachedObject(code);
@@ -171,17 +186,17 @@ public class PlatformService {
			throw new JfwBaseException(-600002, "user too fresh");
		}
	}
	
	@Path("reqBindMail")
	@Path("/reqBindMail")
	@Post
	public void requestBindMail(@JdbcConn Connection con, String mail, String id,@Nullable String url) throws SQLException, JfwBaseException {
	public void requestBindMail(@JdbcConn Connection con, String mail, String id, String url) throws SQLException, JfwBaseException {
		PlatformUser pu = this.platformDao.queryUser(con, mail);
		if (pu != null)
			throw new JfwBaseException(-600001, "already bind");
		pu = this.platformDao.queryUserById(con, id);
		if (pu == null)
			throw new JfwBaseException(-600002, "not exists user["+id+"]");
		
			throw new JfwBaseException(-600002, "not exists user[" + id + "]");
		StateCode<String, String> sc = new StateCode<String, String>();
		sc.setCode(pu.getId());
		sc.setKey(pu.getEmail());
@@ -191,9 +206,8 @@ public class PlatformService {
		final String cachekey = JfwAppContext.cacheObjectAndGenKey(sc);
		Map<String, String> mailParam = new HashMap<String, String>();
		mailParam.put(this.stateCodeWithBindEmail, cachekey);
		if (url != null) {
			mailParam.put(this.urlWithBindEmail, url);
		}
		mailParam.put(this.urlWithBindEmail, url);
		try {
			mailService.sendSimpleMail(mail, this.templateWithBindEmail, mailParam, this.subjectWithBindEmail);
			JfwAppContext.getScheduledExecutorService().schedule(new Runnable() {
@@ -207,9 +221,6 @@ public class PlatformService {
			throw new JfwBaseException(-600003, "mail service error");
		}
	}
	
	
	
	@Post
	@Path("/bindMail")
@@ -226,31 +237,145 @@ public class PlatformService {
		}
	}
	
	@Post
	@Path("/modifypw")
	public int modifypw(@JdbcConn(true) Connection con,String id,String opw,String npw) throws SQLException{
		return this.platformDao.updatePasswd(con, id,StringUtil.md5(opw),StringUtil.md5(npw));
	public int modifypw(@JdbcConn(true) Connection con, String id, String opw, String npw) throws SQLException {
		return this.platformDao.updatePasswd(con, id, StringUtil.md5(opw), StringUtil.md5(npw));
	}
	
	@Post
	@Path("/info")
	public int updateInfo(@JdbcConn(true) Connection con, @RequestParam(excludeFields = { "createTime", "modifyTime" }) PlatformInfo pi) throws SQLException {
		return this.platformDao.update(con, pi);
	}
	
	@Get
	@Path("/info")
	public PlatformInfo info(@JdbcConn Connection con,String id) throws SQLException{
	public PlatformInfo info(@JdbcConn Connection con, String id) throws SQLException {
		return this.platformDao.queryInfo(con, id);
	}
	@Post
	@Path("/add/org")
	public int addOrg(@JdbcConn(true) Connection con, @RequestParam(excludeFields = { "createTime", "id" }) PlatformOrg po)throws SQLException{
	public int addOrg(@JdbcConn(true) Connection con, @RequestParam(excludeFields = { "createTime", "id" }) PlatformOrg po) throws SQLException {
		po.setId(StringUtil.buildUUID());
		return this.platformDao.insert(con, po);
	}
	@Post
	@Path("/resident")
	public int resident(@JdbcConn(true) Connection con, @RequestParam(fields = { @FieldParam(value = "pid", valueClass = String.class),
			@FieldParam(value = "oid", valueClass = String.class) }) ResidentOrg po) throws SQLException {
		return this.platformDao.insert(con, po);
	}
	@Post
	@Path("/buttedOrg")
	public int buttedOrg(@JdbcConn(true) Connection con, @RequestParam(fields = { @FieldParam(value = "pid", valueClass = String.class),
			@FieldParam(value = "oid", valueClass = String.class) }) ButtedOrg po) throws SQLException {
		return this.platformDao.insert(con, po);
	}
	@Post
	@Path("/buttedProfessor")
	public int buttedProfessor(@JdbcConn(true) Connection con, @RequestParam(fields = { @FieldParam(value = "pid", valueClass = String.class),
			@FieldParam(value = "uid", valueClass = String.class) }) ButtedProfessor po) throws SQLException {
		return this.platformDao.insert(con, po);
	}
	@Post
	@Path("/referencedArticle")
	public int referencedArticle(@JdbcConn(true) Connection con, @RequestParam(fields = { @FieldParam(value = "pid", valueClass = String.class),
			@FieldParam(value = "aid", valueClass = String.class) }) ReferencedArticle po) throws SQLException {
		return this.platformDao.insert(con, po);
	}
	@Post
	@Path("/resident/delete")
	public int residentDelete(@JdbcConn(true) Connection con, @RequestParam(fields = { @FieldParam(value = "pid", valueClass = String.class),
			@FieldParam(value = "oid", valueClass = String.class) }) ResidentOrg po) throws SQLException {
		return this.platformDao.delete(con, po);
	}
	@Post
	@Path("/buttedOrg/delete")
	public int buttedOrgDelete(@JdbcConn(true) Connection con, @RequestParam(fields = { @FieldParam(value = "pid", valueClass = String.class),
			@FieldParam(value = "oid", valueClass = String.class) }) ButtedOrg po) throws SQLException {
		return this.platformDao.delete(con, po);
	}
	@Post
	@Path("/buttedProfessor/delete")
	public int buttedProfessorDelete(@JdbcConn(true) Connection con, @RequestParam(fields = { @FieldParam(value = "pid", valueClass = String.class),
			@FieldParam(value = "uid", valueClass = String.class) }) ButtedProfessor po) throws SQLException {
		return this.platformDao.delete(con, po);
	}
	@Post
	@Path("/referencedArticle/delete")
	public int referencedArticleDelete(@JdbcConn(true) Connection con, @RequestParam(fields = { @FieldParam(value = "pid", valueClass = String.class),
			@FieldParam(value = "aid", valueClass = String.class) }) ReferencedArticle po) throws SQLException {
		return this.platformDao.delete(con, po);
	}
	@Get
	@Path("/info/residentOrgs")
	public List<ResidentOrgInfo> queryResidentOrginfos(@JdbcConn Connection con, @DefaultValue("\"z\"") String time, @DefaultValue("\"z\"") String oid,
			String pid, @Nullable String key, int rows) throws SQLException {
		List<ResidentOrgInfo> ret = this.platformDao.queryResientOrgInfo(con, time, oid, pid, key == null ? null : ("%" + key + "%"), rows);
		for (ResidentOrgInfo roi : ret) {
			roi.setHasOrgLogo(this.imageService.hasOrgLogo(roi.getId()));
		}
		return ret;
	}
	@Get
	@Path("/info/buttedOrgs")
	public List<ButtedOrgInfo> queryButtedOrginfos(@JdbcConn Connection con, @DefaultValue("\"z\"") String time, @DefaultValue("\"z\"") String oid, String pid,
			int rows) throws SQLException {
		List<ButtedOrgInfo> ret = this.platformDao.queryButtedOrgInfo(con, time, oid, pid, rows);
		for (ButtedOrgInfo roi : ret) {
			roi.setHasOrgLogo(this.imageService.hasOrgLogo(roi.getId()));
		}
		return ret;
	}
	@Get
	@Path("/info/pqButtedOrgs")
	public PageQueryResult<ButtedOrgInfo> pqButtedOrginfos(@JdbcConn Connection con, String pid, int pageSize, int pageNo) throws SQLException {
		PageQueryResult<ButtedOrgInfo> ret = this.platformDao.pageQueryButtedOrgInfo(con, pid, pageSize, pageNo);
		for (ButtedOrgInfo roi : ret.getData()) {
			roi.setHasOrgLogo(this.imageService.hasOrgLogo(roi.getId()));
		}
		return ret;
	}
	@Get
	@Path("/info/buttedProfessors")
	public List<ButtedProfessorInfo> queryButtedProfessorinfos(@JdbcConn Connection con, @DefaultValue("\"z\"") String time, @DefaultValue("\"z\"") String uid,
			String pid, int rows) throws SQLException {
		List<ButtedProfessorInfo> ret = this.platformDao.queryButtedProfessorInfo(con, time, uid, pid, rows);
		for (ButtedProfessorInfo roi : ret) {
			roi.setHasHeadImage(this.imageService.hasProfessorImage(roi.getId()));
		}
		return ret;
	}
	@Get
	@Path("/info/pqButtedProfessors")
	public PageQueryResult<ButtedProfessorInfo> pageQueryButtedProfessorinfos(@JdbcConn Connection con, String pid, int pageSize, int pageNo)
			throws SQLException {
		PageQueryResult<ButtedProfessorInfo> ret = this.platformDao.queryButtedProfessorInfo(con, pid, pageSize, pageNo);
		for (ButtedProfessorInfo roi : ret.getData()) {
			roi.setHasHeadImage(this.imageService.hasProfessorImage(roi.getId()));
		}
		return ret;
	}
	@Post
	@Path("/upload")
	public List<UploadFile> upload(@Upload UploadItemIterator it) throws Exception {

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

@@ -24,7 +24,7 @@ public class ReferencedArticle {
		return aid;
	}
	public void setAid(String aid) {
		this.aid = oid;
		this.aid = aid;
	}
	public String getCreateTime() {
		return createTime;

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

@@ -0,0 +1,30 @@
package com.ekexiu.portal.platform;
import org.jfw.apt.orm.annotation.entry.CalcColumn;
import org.jfw.apt.orm.annotation.entry.ExtendView;
import org.jfw.apt.orm.core.defaultImpl.StringHandler;
import com.ekexiu.portal.po.Organization;
@ExtendView(fromSentence="ORGANIZATION O INNER JOIN RESIDENT_ORG R ON O.ID = R.OID" ,tableAlias="O")
public class ResidentOrgInfo extends Organization{
	
	private String residentTime;
	private boolean hasOrgLogo;
	public boolean isHasOrgLogo() {
		return hasOrgLogo;
	}
	public void setHasOrgLogo(boolean hasOrgLogo) {
		this.hasOrgLogo = hasOrgLogo;
	}
	@CalcColumn(column="R.CREATE_TIME RESIDENT_TIME",handlerClass=StringHandler.class)
	public String getResidentTime() {
		return residentTime;
	}
	public void setResidentTime(String residentTime) {
		this.residentTime = residentTime;
	}
}

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

@@ -887,6 +887,24 @@ public class ArticleService {
	public List<Article> proPublish(@JdbcConn Connection con, String category, String owner, @DefaultValue("\"9\"") String publishTime,@DefaultValue("Long.MAX_VALUE")long shareId, int rows)throws SQLException {
			return this.articleDao.publish(con,category, owner, publishTime,shareId, rows);
	}
	
	@Get
	@Path("/publishInPlatform")
	public List<Article> publishInPlatform(@JdbcConn Connection con,String pid, @DefaultValue("\"9\"") String publishTime,@DefaultValue("Long.MAX_VALUE")long shareId, int rows)throws SQLException {
			return this.articleDao.publishInPlatform(con,pid, publishTime,shareId, rows);
	}
	@Get
	@Path("/pgPublishInPlatform")
	public PageQueryResult<Article> pgPublishInPlatform(@JdbcConn Connection con,String pid,@Nullable String key,@DefaultValue("10") int pageSize,@DefaultValue("1") int pageNo)throws SQLException {
			return this.articleDao.publishInPlatform(con,pid,key,pageSize,pageNo);
	}
	
	@Get
	@Path("/pgPublishNotInPlatform")
	public PageQueryResult<Article> pgPublishNotInPlatform(@JdbcConn Connection con,String pid,@Nullable String key,@DefaultValue("10") int pageSize,@DefaultValue("1") int pageNo)throws SQLException {
			return this.articleDao.publishInPlatform(con,pid,key,pageSize,pageNo);
	}
	
	@Get
	@Path("/qaForDesk")
@@ -994,12 +1012,12 @@ public class ArticleService {
	@Get
	@Path("/pqself")
	public PageQueryResult<SelfArticle> queryPageSelf(@JdbcConn Connection con, @Nullable String ownerId,
			@Nullable String articleTitle, @DefaultValue("10") int pageSize, @DefaultValue("1") int pageNo) throws SQLException {
		if (articleTitle != null) {
			articleTitle = "%" + articleTitle + "%";
	public PageQueryResult<SelfArticle> queryPageSelf(@JdbcConn Connection con, String articleType, String ownerId,
			@Nullable String key, @DefaultValue("10") int pageSize, @DefaultValue("1") int pageNo) throws SQLException {
		if (key != null) {
			key = "%" + key + "%";
		}
		return this.articleDao.queryPageForSelf(con, ownerId, articleTitle, pageSize, pageNo);
		return this.articleDao.queryPageForSelf(con,articleType,ownerId, key, pageSize, pageNo);
	}
	@Get

src/main/resources/database.sql

@@ -2260,5 +2260,126 @@ COMMENT ON TABLE WARE is '文章关联服务表';
ALTER TABLE PPATENT ADD COLUMN COOPERATION text;
COMMENT ON COLUMN PPATENT.COOPERATION is '合作备注';
--modify begin at version2.40
CREATE TABLE PLATFORM_USER (
	ID CHAR(32) NOT NULL,
	EMAIL TEXT NOT NULL,
	PHONE TEXT,
	PASSWD TEXT NOT NULL,
	STATE CHAR(1) NOT NULL,
	CREATE_TIME CHAR(14) NOT NULL,
	MODIFY_TIME CHAR(14) NOT NULL);
ALTER TABLE PLATFORM_USER ADD PRIMARY KEY (ID);
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：未启用';
CREATE TABLE PLATFORM_INFO (
	ID CHAR(10) NOT NULL,
	NAME TEXT NOT NULL,
	LOGO TEXT,
	LINKMAN TEXT NOT NULL,
	LINKPHONE TEXT NOT NULL,
	LINKEAMIL TEXT NOT NULL,
	PROVINCE TEXT,
	CITY TEXT,
	ADDR TEXT,
	URL TEXT,
	INDUSTRY TEXT,
	DESCP TEXT NOT NULL,
	CREATE_TIME CHAR(14) NOT NULL,
	MODIFY_TIME CHAR(14) NOT NULL);
ALTER TABLE PLATFORM_INFO ADD PRIMARY KEY (ID);
COMMENT ON TABLE PLATFORM_INFO is '平台信息表';
COMMENT ON COLUMN PLATFORM_INFO.NAME is '平台名称';
COMMENT ON COLUMN PLATFORM_INFO.LOGO is '平台LOGO';
COMMENT ON COLUMN PLATFORM_INFO.LINKMAN is '联系人';
COMMENT ON COLUMN PLATFORM_INFO.LINKPHONE is '联系电话';
COMMENT ON COLUMN PLATFORM_INFO.LINKEMAIL is '联系邮箱';
COMMENT ON COLUMN PLATFORM_INFO.PROVINCE is '省';
COMMENT ON COLUMN PLATFORM_INFO.CITY is '市';
COMMENT ON COLUMN PLATFORM_INFO.ADDR is '地址';
COMMENT ON COLUMN PLATFORM_INFO.URL is '官网';
COMMENT ON COLUMN PLATFORM_INFO.INDUSTRY is '面向行业';
COMMENT ON COLUMN PLATFORM_INFO.DESCP is '平台介绍';
 CREATE TABLE REFERENCED_ARTICLE (
 	PID TEXT NOT NULL,
 	AID TEXT NOT NULL,
 	CREATE_TIME CHAR(14) NOT NULL);
ALTER TABLE REFERENCED_ARTICLE ADD PRIMARY KEY (PID,OID);
COMMENT ON TABLE REFERENCED_ARTICLE is '企业动态表';
COMMENT ON COLUMN REFERENCED_ARTICLE.PID is '平台ID';
COMMENT ON COLUMN REFERENCED_ARTICLE.AID is '文章ID';
COMMENT ON COLUMN REFERENCED_ARTICLE.CREATE_TIME is '关联时间';
 CREATE TABLE RESIDENT_ORG (
 	PID TEXT NOT NULL,
 	OID TEXT NOT NULL,
 	CREATE_TIME CHAR(14) NOT NULL);
ALTER TABLE RESIDENT_ORG ADD PRIMARY KEY (PID,OID);
COMMENT ON TABLE RESIDENT_ORG is '平台入驻企业表';
COMMENT ON COLUMN RESIDENT_ORG.PID is '平台ID';
COMMENT ON COLUMN RESIDENT_ORG.OID is '企业ID';
COMMENT ON COLUMN RESIDENT_ORG.CREATE_TIME is '入驻时间';
 CREATE TABLE BUTTED_ORG (
 	PID TEXT NOT NULL,
 	OID TEXT NOT NULL,
 	CREATE_TIME CHAR(14) NOT NULL);
ALTER TABLE BUTTED_ORG ADD PRIMARY KEY (PID,OID);
COMMENT ON TABLE BUTTED_ORG is '对接的平台机构表';
COMMENT ON COLUMN BUTTED_ORG.PID is '平台ID';
COMMENT ON COLUMN BUTTED_ORG.OID is '对接的机构ID';
COMMENT ON COLUMN BUTTED_ORG.CREATE_TIME is '对接时间';
 CREATE TABLE BUTTED_PROFESSOR (
 	PID TEXT NOT NULL,
 	UID TEXT NOT NULL,
 	CREATE_TIME CHAR(14) NOT NULL);
ALTER TABLE BUTTED_PROFESSOR ADD PRIMARY KEY (PID,OID);
COMMENT ON TABLE BUTTED_PROFESSOR is '对接的平台专家表';
COMMENT ON COLUMN BUTTED_PROFESSOR.PID is '平台ID';
COMMENT ON COLUMN BUTTED_PROFESSOR.UID is '对接的专家ID';
COMMENT ON COLUMN BUTTED_PROFESSOR.CREATE_TIME is '对接时间';
CREATE TABLE PLATFORM_ORG (
	ID TEXT NOT NULL,
	PID TEXT NOT NULL,
	LOGO TEXT,
	NAME TEXT NOT NULL,
	EMAIL TEXT NOT NULL,
	ADDR TEXT,
	LINKMAN TEXT,
	LINKPHONE TEXT,
	INDUSTRY TEXT,
	DESCP TEXT,
	CREATE_TIME CHAR(14) NOT NULL);
ALTER TABLE PLATFORM_ORG ADD PRIMARY KEY (ID);
COMMENT ON TABLE PLATFORM_ORG is '平台待入驻企业表';
COMMENT ON COLUMN PLATFORM_ORG.PID is '平台ID';
COMMENT ON COLUMN PLATFORM_ORG.NAME is '企业全称';
COMMENT ON COLUMN PLATFORM_ORG.EMAIL is '企业邮箱';
COMMENT ON COLUMN PLATFORM_ORG.ADDR is '企业地址';
COMMENT ON COLUMN PLATFORM_ORG.LINKMAN is '联系人';
COMMENT ON COLUMN PLATFORM_ORG.LINKPHONE is '联系电话';
COMMENT ON COLUMN PLATFORM_ORG.INDUSTRY is '所属行业';
COMMENT ON COLUMN PLATFORM_ORG.DESCP is '企业介绍';