d

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/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/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,18 +6,27 @@ 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.LimitSelect;
import org.jfw.apt.orm.annotation.dao.method.operator.QueryList;
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;
@DAO
public interface PlatformDao {
@@ -116,16 +125,39 @@ public interface PlatformDao {
	@From(ResidentOrg.class)
	int deleteResidentOrg(Connection con, String pid, String oid) throws SQLException;
	@SelectOne
	@DeleteWith
	@From(ButtedOrg.class)
	int deleteButtedOrg(Connection con, String pid, String oid) throws SQLException;
	@SelectOne
	@DeleteWith
	@From(ButtedProfessor.class)
	int deleteButtedProfessor(Connection con, String pid, String uid) throws SQLException;
	@SelectOne
	@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;
	@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;
}

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

@@ -17,6 +17,7 @@ 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.operate.Get;
@@ -35,6 +36,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 {
@@ -63,6 +65,19 @@ public class PlatformService {
	private File imgPath;
	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;
@@ -122,7 +137,7 @@ public class PlatformService {
		return ret;
	}
	@Path("reqResetPw")
	@Path("/reqResetPw")
	@Post
	public void requestResetPasswordWithEmail(@JdbcConn Connection con, String mail, @Nullable String url) throws SQLException, JfwBaseException {
		PlatformUser pu = this.platformDao.queryUser(con, mail);
@@ -169,7 +184,7 @@ public class PlatformService {
		}
	}
	@Path("reqBindMail")
	@Path("/reqBindMail")
	@Post
	public void requestBindMail(@JdbcConn Connection con, String mail, String id, @Nullable String url) throws SQLException, JfwBaseException {
		PlatformUser pu = this.platformDao.queryUser(con, mail);
@@ -303,6 +318,40 @@ public class PlatformService {
			@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/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;
	}
	
	@Post
	@Path("/upload")

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

@@ -2262,3 +2262,5 @@ COMMENT ON COLUMN PPATENT.COOPERATION is '合作备注';