--新的文章和资源相关接口;

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

@@ -104,18 +104,33 @@ public abstract class ArticleDao {
	@Where("STATUS = '1'")
	public abstract PageQueryResult<Article> queryPageForPublish(Connection con,@Like@Nullable String articleTitle,int pageSize,int pageNo) throws SQLException;
	
	public PageQueryResult<Article> queryPageForSelf(Connection con,@Nullable String articleTitle,int pageSize,int pageNo) throws SQLException{
	public PageQueryResult<Article> queryPageForSelf(Connection con,@Nullable String professorId,@Nullable String orgId,
			@Nullable String articleTitle,int pageSize,int pageNo) throws SQLException{
        int total = 0;
        PageQueryResult<Article> queryResult = new PageQueryResult<Article>();
        int index = 1;
        boolean hasProfessorId = null != professorId;
        boolean hasOrgId = null != orgId;
        boolean hasArticleTitle = null != articleTitle;
        StringBuilder sql = new StringBuilder();
        sql.append("SELECT COUNT(1) FROM ARTICLE WHERE STATUS IN('0','1','2')");
        if(hasProfessorId){
        	sql.append(" AND PROFESSOR_ID = ?");
        }
        if(hasOrgId){
        	sql.append(" AND ORG_ID = ?");
        }
        if(hasArticleTitle){
        	sql.append(" AND ARTICLE_TITLE LIKE ?");
        }
        PreparedStatement ps = con.prepareStatement(sql.toString());
        try{
        	if(hasProfessorId){
        		ps.setString(index++, professorId);
        	}
        	if(hasOrgId){
        		ps.setString(index++, orgId);
        	}
        	if(hasArticleTitle){
        		ps.setString(index++, articleTitle);
        	}
@@ -141,10 +156,22 @@ public abstract class ArticleDao {
        	queryResult.setPageNo(1);
        	sql = new StringBuilder();
        	sql.append("(SELECT ARTICLE_ID,PROFESSOR_ID,ARTICLE_TITLE,ARTICLE_CONTENT,SUBJECT,INDUSTRY,PUBLISH_TIME,ARTICLE_IMG,ORG_ID,ARTICLE_TYPE,ARTICLE_AGREE,PAGE_VIEWS,STATUS,CREATE_TIME,MODIFY_TIME FROM ARTICLE WHERE STATUS IN('0','2')");
        	if(hasProfessorId){
            	sql.append(" AND PROFESSOR_ID = ?");
            }
            if(hasOrgId){
            	sql.append(" AND ORG_ID = ?");
            }
        	if(hasArticleTitle){
        		sql.append(" AND ARTICLE_TITLE LIKE ?");
        	}
        	sql.append(" ORDER BY MODIFY_TIME DESC) UNION ALL (SELECT ARTICLE_ID,PROFESSOR_ID,ARTICLE_TITLE,ARTICLE_CONTENT,SUBJECT,INDUSTRY,PUBLISH_TIME,ARTICLE_IMG,ORG_ID,ARTICLE_TYPE,ARTICLE_AGREE,PAGE_VIEWS,STATUS,CREATE_TIME,MODIFY_TIME FROM ARTICLE WHERE STATUS = '1'");
        	if(hasProfessorId){
            	sql.append(" AND PROFESSOR_ID = ?");
            }
            if(hasOrgId){
            	sql.append(" AND ORG_ID = ?");
            }
        	if(hasArticleTitle){
        		sql.append(" AND ARTICLE_TITLE LIKE ?");
        	}
@@ -161,11 +188,24 @@ public abstract class ArticleDao {
            queryResult.setPageNo(pageNo);
            --pageNo;
            int offset = (pageNo * pageSize);
            sql = new StringBuilder();
            sql.append("(SELECT ARTICLE_ID,PROFESSOR_ID,ARTICLE_TITLE,ARTICLE_CONTENT,SUBJECT,INDUSTRY,PUBLISH_TIME,ARTICLE_IMG,ORG_ID,ARTICLE_TYPE,ARTICLE_AGREE,PAGE_VIEWS,STATUS,CREATE_TIME,MODIFY_TIME FROM ARTICLE WHERE STATUS IN('0','2')");
        	if(hasProfessorId){
            	sql.append(" AND PROFESSOR_ID = ?");
            }
            if(hasOrgId){
            	sql.append(" AND ORG_ID = ?");
            }
        	if(hasArticleTitle){
        		sql.append(" AND ARTICLE_TITLE LIKE ?");
        	}
        	sql.append(" ORDER BY MODIFY_TIME DESC) UNION ALL (SELECT ARTICLE_ID,PROFESSOR_ID,ARTICLE_TITLE,ARTICLE_CONTENT,SUBJECT,INDUSTRY,PUBLISH_TIME,ARTICLE_IMG,ORG_ID,ARTICLE_TYPE,ARTICLE_AGREE,PAGE_VIEWS,STATUS,CREATE_TIME,MODIFY_TIME FROM ARTICLE WHERE STATUS = '1'");
        	if(hasProfessorId){
            	sql.append(" AND PROFESSOR_ID = ?");
            }
            if(hasOrgId){
            	sql.append(" AND ORG_ID = ?");
            }
        	if(hasArticleTitle){
        		sql.append(" AND ARTICLE_TITLE LIKE ?");
        	}
@@ -173,9 +213,25 @@ public abstract class ArticleDao {
            sql.append(" LIMIT ").append(pageSize).append(" OFFSET ").append(offset);
        }
        ps = con.prepareStatement(sql.toString());
        System.out.println(sql.toString());
        index = 1;
        try{
        	if(hasProfessorId){
        		ps.setString(index++, professorId);
        	}
        	if(hasOrgId){
        		ps.setString(index++, orgId);
        	}
        	if(hasArticleTitle){
        		ps.setString(index++, articleTitle);
        	}
        	if(hasProfessorId){
        		ps.setString(index++, professorId);
        	}
        	if(hasOrgId){
        		ps.setString(index++, orgId);
        	}
        	if(hasArticleTitle){
        		ps.setString(index++, articleTitle);
        	}
            ResultSet rs = ps.executeQuery();
@@ -187,11 +243,11 @@ public abstract class ArticleDao {
                    ++size;
                    Article article =  new Article();
                    article.setArticleId(rs.getString(1));
                    String professorId = rs.getString(2);
                    String proId = rs.getString(2);
                    if(rs.wasNull()){
                    	professorId = null;
                    	proId = null;
                    }
                    article.setProfessorId(professorId);
                    article.setProfessorId(proId);
                    article.setArticleTitle(rs.getString(3));
                    String articleContent = rs.getString(4);
                    if(rs.wasNull()){
@@ -218,11 +274,11 @@ public abstract class ArticleDao {
                    	articleImg = null;
                    }
                    article.setArticleImg(articleImg);
                    String orgId = rs.getString(9);
                    String org = rs.getString(9);
                    if(rs.wasNull()){
                    	orgId = null;
                    	org = null;
                    }
                    article.setOrgId(orgId);
                    article.setOrgId(org);
                    String articleType = rs.getString(10);
                    if(rs.wasNull()){
                    	articleType = null;

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

@@ -1,7 +1,10 @@
package com.ekexiu.portal.dao;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
import org.jfw.apt.annotation.DefaultValue;
@@ -11,7 +14,6 @@ import org.jfw.apt.orm.annotation.dao.method.From;
import org.jfw.apt.orm.annotation.dao.method.operator.DeleteWith;
import org.jfw.apt.orm.annotation.dao.method.operator.Insert;
import org.jfw.apt.orm.annotation.dao.method.operator.QueryVal;
import org.jfw.apt.orm.annotation.dao.method.operator.SelectList;
import org.jfw.apt.orm.core.defaultImpl.IntHandler;
import com.ekexiu.portal.po.ArticlePro;
@@ -28,8 +30,30 @@ public abstract class ArticleResDao {
	@DefaultValue("0")
	public abstract int queryByArticleId(Connection con, String articleId) throws SQLException;
	@SelectList
	public abstract List<ArticleRes> query(Connection con, String articleId) throws SQLException;
	public List<ArticleRes> query(Connection con,java.lang.String articleId) throws SQLException{
        int index = 1;
        String sql = "SELECT ARTICLE_ID,A.RESOURCE_ID,A.CREATE_TIME FROM ARTICLE_RES A INNER JOIN RESOURCE R ON A.RESOURCE_ID = R.RESOURCE_ID WHERE R.STATUS = '1' AND ARTICLE_ID = ?";
        PreparedStatement ps = con.prepareStatement(sql);
        try{
            ps.setString(index++,articleId);
            ResultSet rs = ps.executeQuery();
            try{
                List<ArticleRes> result = new ArrayList<ArticleRes>();
                while(rs.next()){
                    ArticleRes articleRes =  new ArticleRes();
                    articleRes.setArticleId(rs.getString(1));
                    articleRes.setResourceId(rs.getString(2));
                    articleRes.setCreateTime(rs.getString(3));
                    result.add(articleRes);
                }
                return result;
            }finally{
                try{rs.close();}catch(Exception e1){}
            }
        }finally{
            try{ps.close();}catch(Exception e2){}
        }
    }
	
	@DeleteWith
	@From(ArticleRes.class)

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

@@ -10,6 +10,8 @@ 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.Select;
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;
@@ -143,6 +145,12 @@ public abstract class OrgDao {
	@LimitQuery
	public abstract List<Organization> limitQuery(Connection con, @Like String name,int rows)throws SQLException;
	
	@LimitQuery
	@From(Organization.class)
	@OrderBy("ORDER BY NAME")
	@Select(Organization.class)
	public abstract List<EditOrganization> queryLimit(Connection con,@Like String name,int rows)throws SQLException;
	
	@Nullable
	@QueryVal
	@Column(handlerClass=StringHandler.class,value="id")

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

@@ -341,6 +341,75 @@ public abstract class ProfessorDao {
        }
	}
	
	public List<EditProfessor> queryByName(Connection con,String name,int total) throws SQLException{
        int index = 1;
        String sql = "SELECT P.OFFICE,P.DEPARTMENT,P.TITLE,AUTHENTICATION,AUTH_TYPE,P.AUTH_STATUS,P.ID,P.NAME,P.ADDRESS,P.ORG_AUTH,ORGANIZATION.NAME,P.ORG_ID,P.SCORE_PERCENT "
        		+ " FROM PROFESSOR P LEFT JOIN ORGANIZATION ON P.ORG_ID = ORGANIZATION.ID WHERE P.NAME LIKE ? ORDER BY P.SCORE_PERCENT DESC LIMIT ? ";
        PreparedStatement ps = con.prepareStatement(sql);
        try{
            ps.setString(index++,name);
            ps.setInt(index++, total);
            ResultSet rs = ps.executeQuery();
            try{
                List<EditProfessor> editProfessors = new ArrayList<EditProfessor>();
                while(rs.next()){
                	EditProfessor professor =  new EditProfessor();
                	String office = rs.getString(1);
                	if(rs.wasNull()){
                		office = null;
                	}
                    professor.setOffice(office);
                    String depart = rs.getString(2);
                    if(rs.wasNull()){
                    	depart = null;
                	}
                    professor.setDepartment(depart);
                    String title = rs.getString(3);
                    if(rs.wasNull()){
                    	title = null;
                	}
                    professor.setTitle(title);
                    Integer auth = rs.getInt(4);
                    if(rs.wasNull()){
                    	auth = null;
                    }
                    professor.setAuthentication(auth);
                    professor.setAuthType(rs.getInt(5));
                    professor.setAuthStatus(rs.getInt(6));
                    professor.setId(rs.getString(7));
                    professor.setName(rs.getString(8));
                    String address = rs.getString(9);
                    if(rs.wasNull()){
                    	address = null;
                	}
                    professor.setAddress(address);
                    professor.setOrgAuth(rs.getString(10));
                    String orgName = rs.getString(11);
                    if(rs.wasNull()){
                    	orgName = null;
                    }
                    professor.setOrgName(orgName);
                    String orgId = rs.getString(12);
                    if(rs.wasNull()){
                    	orgId = null;
                    }
                    professor.setOrgId(orgId);
                    String scorePercent = rs.getString(13);
                    if(rs.wasNull()){
                    	scorePercent = null;
                    }
                    professor.setScorePercent(scorePercent);
                    editProfessors.add(professor);
                }
                return editProfessors;
            }finally{
                try{rs.close();}catch(Exception e1){}
            }
        }finally{
            try{ps.close();}catch(Exception e2){}
        }
    }
	
	/**
	 * 查询专家基本信息+星级+咨询次数的接口
	 * @param con

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

@@ -9,12 +9,19 @@ import java.util.Collections;
import java.util.List;
import org.jfw.apt.annotation.Autowrie;
import org.jfw.apt.annotation.Nullable;
import org.jfw.apt.orm.annotation.dao.DAO;
import org.jfw.apt.orm.annotation.dao.Dynamic;
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.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.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.Like;
import org.jfw.apt.orm.annotation.dao.param.Set;
import org.jfw.util.PageQueryResult;
@@ -52,6 +59,18 @@ public abstract class ResourceDao {
	@Update
	public abstract int update(Connection con,Resource resource) throws SQLException;
	
	@Update
	@Dynamic
	public abstract int updateRes(Connection con,Resource resource) throws SQLException;
	
	@UpdateWith
	@From(Resource.class)
	public abstract int updateStatus(Connection con, String resourceId, @Set String status) throws SQLException;
	
	@UpdateWith
	@From(Resource.class)
	public abstract int updatePublishTime(Connection con,String resourceId,@Set String status,@Set String publishTime)throws SQLException;
	
	@UpdateWith
	@From(Resource.class)
	public abstract int updateNameAndSupport(Connection con, String resourceId, @Set String resourceName, 
@@ -85,6 +104,10 @@ public abstract class ResourceDao {
	@From(Resource.class)
	public abstract int delete(Connection con, String resourceId) throws SQLException;
	
	@SelectOne
	@Nullable
	public abstract Resource queryOne(Connection con, String resourceId) throws SQLException;
	
	/**
	 * 查询资源基础信息(ID,名称,学术领域,应用行业,可提供服务,发布者ID,资源图片)
	 * @param con
@@ -93,7 +116,6 @@ public abstract class ResourceDao {
	 * @throws SQLException
	 */
	public Resource queryBaseInfo(Connection con,String resourceId) throws SQLException{
        List<Image> images = this.imageDao.queryRes(con, resourceId);
        String sql = "SELECT RESOURCE_ID,RESOURCE_NAME,SUBJECT,INDUSTRY,SUPPORTED_SERVICES,PROFESSOR_ID"
        		+ " FROM RESOURCE WHERE RESOURCE_ID = ?";
        PreparedStatement ps = con.prepareStatement(sql);
@@ -117,6 +139,7 @@ public abstract class ResourceDao {
                    resource.setIndustry(industry);
                    resource.setSupportedServices(rs.getString(5));
                    resource.setProfessorId(rs.getString(6));
                    List<Image> images = this.imageDao.queryRes(con, resourceId);
                    resource.setImages(images);
                    return resource;
                }else{
@@ -394,6 +417,11 @@ public abstract class ResourceDao {
        }
    }
	
	@LimitSelect
	@Where("STATUS = '1'")
	@OrderBy("ORDER BY PUBLISH_TIME DESC")
	public abstract List<Resource> queryByName(Connection con, @Like String resourceName, int rows) throws SQLException;
	
	/**
	 * 按专家ID查询发布的所有资源
	 * @param con

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

@@ -3,12 +3,14 @@ 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.defaultImpl.IntHandler;
import org.jfw.apt.orm.core.enums.DE;
@PrimaryKey("imageId")
@Table
public class Image {
	private String imageId;
	private int sort;
	private String imageSrc;
	private String resourceId;
	private Resource resource;
@@ -26,7 +28,13 @@ public class Image {
	public void setImageId(String imageId) {
		this.imageId = imageId;
	}
	
	@Column(handlerClass=IntHandler.class, dbType="INTEGER", nullable=true)
	public int getSort() {
		return sort;
	}
	public void setSort(int sort) {
		this.sort = sort;
	}
	@Column(DE.string_de)
	public String getImageSrc() {
		return imageSrc;
@@ -34,7 +42,6 @@ public class Image {
	public void setImageSrc(String imageSrc) {
		this.imageSrc = imageSrc;
	}
	
	@Column(DE.id_32)
	public String getResourceId() {
		return resourceId;

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

@@ -5,6 +5,7 @@ import java.util.List;
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.defaultImpl.FixLenStringHandler;
import org.jfw.apt.orm.core.defaultImpl.StringHandler;
import org.jfw.apt.orm.core.enums.DE;
@@ -17,12 +18,28 @@ import com.ekexiu.portal.pojo.EditProfessor;
public class Resource implements CreateTimeSupported, ModifyTimeSupported{
	private String resourceId;
	private String resourceName;
	/**
	 * 关键字
	 */
	private String subject;
	private String industry;
	/**
	 * 资源提供的服务
	 * 资源提供的服务、应用用途
	 */
	private String supportedServices;
	private String orgName;
	/**
	 * 厂商及型号规格
	 */
	private String spec;
	/**
	 * 性能参数
	 */
	private String parameter;
	/**
	 * 
	 */
	private String status;
	private String descp;
	private String professorId;
	private Professor professor;
@@ -39,6 +56,10 @@ public class Resource implements CreateTimeSupported, ModifyTimeSupported{
	 * 合作备注
	 */
	private String cooperationNotes;
	/**
	 * 发布时间
	 */
	private String publishTime;
	
	public List<Image> getImages() {
		return images;
@@ -101,6 +122,38 @@ public class Resource implements CreateTimeSupported, ModifyTimeSupported{
		this.supportedServices = supportedServices;
	}
	
	@Column(DE.String_de)
	public String getOrgName() {
		return orgName;
	}
	public void setOrgName(String orgName) {
		this.orgName = orgName;
	}
	
	@Column(DE.String_de)
	public String getSpec() {
		return spec;
	}
	public void setSpec(String spec) {
		this.spec = spec;
	}
	
	@Column(handlerClass=FixLenStringHandler.class,dbType="TEXT",nullable=true)
	public String getParameter() {
		return parameter;
	}
	public void setParameter(String parameter) {
		this.parameter = parameter;
	}
	
	@Column(handlerClass=FixLenStringHandler.class,dbType="CHAR(1)",nullable=true,renewable=false)
	public String getStatus() {
		return status;
	}
	public void setStatus(String status) {
		this.status = status;
	}
	
	@Column(handlerClass=StringHandler.class,dbType="TEXT",insertable=true,nullable=true,renewable=true,queryable=true)
	public String getDescp() {
		return descp;
@@ -154,4 +207,13 @@ public class Resource implements CreateTimeSupported, ModifyTimeSupported{
	public void setCooperationNotes(String cooperationNotes) {
		this.cooperationNotes = cooperationNotes;
	}
	
	@Column(handlerClass=FixLenStringHandler.class,dbType="CHAR(14)",nullable=true,renewable=false)
	public String getPublishTime() {
		return publishTime;
	}
	public void setPublishTime(String publishTime) {
		this.publishTime = publishTime;
	}
	
}

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

@@ -288,8 +288,8 @@ public class ArticleService {
	
	@Post
	@Path("/save")
	public String saveArticle(@JdbcConn(true) Connection con,Article article,String[] professors,String[] resources)
			throws SQLException, IOException, JfwBaseException{
	public String saveArticle(@JdbcConn(true) Connection con,Article article,@Nullable String[] professors,
			@Nullable String[] resources) throws SQLException, IOException, JfwBaseException{
		if(article.getArticleId() == null){
			String articleId = StringUtil.buildUUID();
			if(article.getArticleImg() != null){
@@ -309,17 +309,21 @@ public class ArticleService {
				throw new JfwBaseException(-1, "错误参数：文章发布者ID");
			}
			this.articleDao.insert(con, article);
			for (String professor : professors) {
				ArticlePro articlePro = new ArticlePro();
				articlePro.setArticleId(articleId);
				articlePro.setProfessorId(professor);
				this.articleProDao.insert(con, articlePro);
			if(professors != null){
				for (String professor : professors) {
					ArticlePro articlePro = new ArticlePro();
					articlePro.setArticleId(articleId);
					articlePro.setProfessorId(professor);
					this.articleProDao.insert(con, articlePro);
				}
			}
			for (String resource : resources) {
				ArticleRes articleRes = new ArticleRes();
				articleRes.setArticleId(articleId);
				articleRes.setResourceId(resource);
				this.articleResDao.insert(con, articleRes);
			if(resources != null){
				for (String resource : resources) {
					ArticleRes articleRes = new ArticleRes();
					articleRes.setArticleId(articleId);
					articleRes.setResourceId(resource);
					this.articleResDao.insert(con, articleRes);
				}
			}
			return articleId;
		}else if(article.getArticleId().trim().length() == 32){
@@ -331,17 +335,21 @@ public class ArticleService {
			this.articleDao.updatePublishTime(con, article.getArticleId(), "1", this.publishTime());
			this.articleProDao.delete(con, article.getArticleId());
			this.articleResDao.delete(con, article.getArticleId());
			for (String professor : professors) {
				ArticlePro articlePro = new ArticlePro();
				articlePro.setArticleId(article.getArticleId());
				articlePro.setProfessorId(professor);
				this.articleProDao.insert(con, articlePro);
			if(professors != null){
				for (String professor : professors) {
					ArticlePro articlePro = new ArticlePro();
					articlePro.setArticleId(article.getArticleId());
					articlePro.setProfessorId(professor);
					this.articleProDao.insert(con, articlePro);
				}
			}
			for (String resource : resources) {
				ArticleRes articleRes = new ArticleRes();
				articleRes.setArticleId(article.getArticleId());
				articleRes.setResourceId(resource);
				this.articleResDao.insert(con, articleRes);
			if(resources != null){
				for (String resource : resources) {
					ArticleRes articleRes = new ArticleRes();
					articleRes.setArticleId(article.getArticleId());
					articleRes.setResourceId(resource);
					this.articleResDao.insert(con, articleRes);
				}
			}
			return article.getArticleId();
		}else{
@@ -351,8 +359,8 @@ public class ArticleService {
	
	@Post
	@Path("/draft")
	public String draft(@JdbcConn(true) Connection con,Article article,String[] professors,String[] resources)
			throws SQLException, IOException, JfwBaseException{
	public String draft(@JdbcConn(true) Connection con,Article article,@Nullable String[] professors,
			@Nullable String[] resources) throws SQLException, IOException, JfwBaseException{
		if(article.getArticleId() == null){
			String articleId = StringUtil.buildUUID();
			if(article.getArticleImg() != null){
@@ -371,17 +379,21 @@ public class ArticleService {
				throw new JfwBaseException(-1, "错误参数：文章发布者ID");
			}
			this.articleDao.insert(con, article);
			for (String professor : professors) {
				ArticlePro articlePro = new ArticlePro();
				articlePro.setArticleId(articleId);
				articlePro.setProfessorId(professor);
				this.articleProDao.insert(con, articlePro);
			if(professors != null){
				for (String professor : professors) {
					ArticlePro articlePro = new ArticlePro();
					articlePro.setArticleId(articleId);
					articlePro.setProfessorId(professor);
					this.articleProDao.insert(con, articlePro);
				}
			}
			for (String resource : resources) {
				ArticleRes articleRes = new ArticleRes();
				articleRes.setArticleId(articleId);
				articleRes.setResourceId(resource);
				this.articleResDao.insert(con, articleRes);
			if(resources != null){
				for (String resource : resources) {
					ArticleRes articleRes = new ArticleRes();
					articleRes.setArticleId(articleId);
					articleRes.setResourceId(resource);
					this.articleResDao.insert(con, articleRes);
				}
			}
			return articleId;
		}else if(article.getArticleId().trim().length() == 32){
@@ -393,17 +405,21 @@ public class ArticleService {
			this.articleDao.updateStatus(con, article.getArticleId(), "0");
			this.articleProDao.delete(con, article.getArticleId());
			this.articleResDao.delete(con, article.getArticleId());
			for (String professor : professors) {
				ArticlePro articlePro = new ArticlePro();
				articlePro.setArticleId(article.getArticleId());
				articlePro.setProfessorId(professor);
				this.articleProDao.insert(con, articlePro);
			if(professors != null){
				for (String professor : professors) {
					ArticlePro articlePro = new ArticlePro();
					articlePro.setArticleId(article.getArticleId());
					articlePro.setProfessorId(professor);
					this.articleProDao.insert(con, articlePro);
				}
			}
			for (String resource : resources) {
				ArticleRes articleRes = new ArticleRes();
				articleRes.setArticleId(article.getArticleId());
				articleRes.setResourceId(resource);
				this.articleResDao.insert(con, articleRes);
			if(resources != null){
				for (String resource : resources) {
					ArticleRes articleRes = new ArticleRes();
					articleRes.setArticleId(article.getArticleId());
					articleRes.setResourceId(resource);
					this.articleResDao.insert(con, articleRes);
				}
			}
			return article.getArticleId();
		}else{
@@ -413,8 +429,8 @@ public class ArticleService {
	
	@Post
	@Path("/timing")
	public String timingPublish(@JdbcConn(true) Connection con,Article article,String[] professors,String[] resources)
			throws SQLException, IOException, JfwBaseException{
	public String timingPublish(@JdbcConn(true) Connection con,Article article,@Nullable String[] professors,
			@Nullable String[] resources) throws SQLException, IOException, JfwBaseException{
		if(article.getPublishTime() == null){
			throw new JfwBaseException(-3, "no parameter found:publishTime");
		}
@@ -436,17 +452,21 @@ public class ArticleService {
				throw new JfwBaseException(-1, "错误参数：文章发布者ID");
			}
			this.articleDao.insert(con, article);
			for (String professor : professors) {
				ArticlePro articlePro = new ArticlePro();
				articlePro.setArticleId(articleId);
				articlePro.setProfessorId(professor);
				this.articleProDao.insert(con, articlePro);
			if(professors != null){
				for (String professor : professors) {
					ArticlePro articlePro = new ArticlePro();
					articlePro.setArticleId(articleId);
					articlePro.setProfessorId(professor);
					this.articleProDao.insert(con, articlePro);
				}
			}
			for (String resource : resources) {
				ArticleRes articleRes = new ArticleRes();
				articleRes.setArticleId(articleId);
				articleRes.setResourceId(resource);
				this.articleResDao.insert(con, articleRes);
			if(resources != null){
				for (String resource : resources) {
					ArticleRes articleRes = new ArticleRes();
					articleRes.setArticleId(articleId);
					articleRes.setResourceId(resource);
					this.articleResDao.insert(con, articleRes);
				}
			}
			return articleId;
		}else if(article.getArticleId().trim().length() == 32){
@@ -456,19 +476,24 @@ public class ArticleService {
			}
			this.articleDao.update(con, article);
			this.articleDao.updatePublishTime(con, article.getArticleId(), "2", article.getPublishTime());
			this.articleResDao.delete(con, article.getArticleId());
			this.articleProDao.delete(con, article.getArticleId());
			this.articleResDao.delete(con, article.getArticleId());
			for (String professor : professors) {
				ArticlePro articlePro = new ArticlePro();
				articlePro.setArticleId(article.getArticleId());
				articlePro.setProfessorId(professor);
				this.articleProDao.insert(con, articlePro);
			if(professors != null){
				for (String professor : professors) {
					ArticlePro articlePro = new ArticlePro();
					articlePro.setArticleId(article.getArticleId());
					articlePro.setProfessorId(professor);
					this.articleProDao.insert(con, articlePro);
				}
			}
			for (String resource : resources) {
				ArticleRes articleRes = new ArticleRes();
				articleRes.setArticleId(article.getArticleId());
				articleRes.setResourceId(resource);
				this.articleResDao.insert(con, articleRes);
			if(resources != null){
				for (String resource : resources) {
					ArticleRes articleRes = new ArticleRes();
					articleRes.setArticleId(article.getArticleId());
					articleRes.setResourceId(resource);
					this.articleResDao.insert(con, articleRes);
				}
			}
			return article.getArticleId();
		}else{
@@ -581,12 +606,12 @@ public class ArticleService {
	
	@Get
	@Path("/pqself")
	public PageQueryResult<Article> queryPageSelf(@JdbcConn Connection con,@Nullable String articleTitle,
			@DefaultValue("10") int pageSize,@DefaultValue("1") int pageNo)throws SQLException{
	public PageQueryResult<Article> queryPageSelf(@JdbcConn Connection con,@Nullable String professorId,@Nullable String orgId,
			@Nullable String articleTitle,@DefaultValue("10") int pageSize,@DefaultValue("1") int pageNo)throws SQLException{
		if(articleTitle != null){
			articleTitle = "%" + articleTitle + "%";
		}
		return this.articleDao.queryPageForSelf(con, articleTitle, pageSize, pageNo);
		return this.articleDao.queryPageForSelf(con, professorId, orgId, articleTitle, pageSize, pageNo);
	}
	
	@Get

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

@@ -10,6 +10,8 @@ import java.io.IOException;
import java.io.InputStream;
import java.sql.Connection;
import java.sql.SQLException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import javax.imageio.ImageIO;
@@ -36,7 +38,9 @@ import com.ekexiu.portal.util.PictureRotating;
public class ImagesService {
	private File tmpPath;
	private File resourcePath;
	private File resourceDataPath;
	private int resImageMaxLen = 240;
	private String dateFormat = "yyyyMM";
	private static final String JPG = "jpg";
	@Autowrie
	private ImageDao imageDao;
@@ -57,6 +61,14 @@ public class ImagesService {
		this.resourcePath = resourcePath;
	}
	public File getResourceDataPath() {
		return resourceDataPath;
	}
	public void setResourceDataPath(File resourceDataPath) {
		this.resourceDataPath = resourceDataPath;
	}
	public int getResImageMaxLen() {
		return resImageMaxLen;
	}
@@ -65,6 +77,14 @@ public class ImagesService {
		this.resImageMaxLen = resImageMaxLen;
	}
	public String getDateFormat() {
		return dateFormat;
	}
	public void setDateFormat(String dateFormat) {
		this.dateFormat = dateFormat;
	}
	public ImageDao getImageDao() {
		return imageDao;
	}
@@ -95,6 +115,12 @@ public class ImagesService {
		}
	}
	
	private String createDate(){
		SimpleDateFormat df = new SimpleDateFormat(this.dateFormat);
		String date = df.format(new Date());
		return date;
	}
	
	@Post
	@Path("/resourceImg")
	public String insert(@JdbcConn(true) Connection con, String resourceId, String fn) 
@@ -119,6 +145,27 @@ public class ImagesService {
		}
	}
	
	@Post
	@Path("/saveImg")
	public void saveImg(@JdbcConn(true) Connection con, String resourceId, String[] fns) 
			throws SQLException, IOException, JfwBaseException {
		for (int i = 0; i < fns.length; i++) {
			byte[] src = this.readTmpFile(fns[i]);
			src = JpgUtil.read(src);
			byte[] shareResImage = this.resImage(src, this.resImageMaxLen);
			IoUtil.saveStream(new FileOutputStream(new File(this.resourceDataPath + "/" + this.createDate(), resourceId + "_" + i+1 + "." + JPG)), src, true);
			IoUtil.saveStream(new FileOutputStream(new File(this.resourceDataPath + "/" + this.createDate(), resourceId + "_" + i+1 + "_s." + JPG)), shareResImage, true);
			Image image = new Image();
			String imageId = StringUtil.buildUUID();
			image.setImageId(imageId);
			image.setSort(i+1);
			String imageSrc = this.createDate() + "/" + resourceId + "_" + i+1 + "." + JPG;
			image.setImageSrc(imageSrc);
			image.setResourceId(resourceId);
			this.imageDao.insert(con, image);
		}
	}
	
	@Post
	@Path("/saveResImg")
	public String insertResourceImg(@JdbcConn(true) Connection con, String resourceId, String base64, Integer angle) throws SQLException, IOException {

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

@@ -107,12 +107,27 @@ public class OrgService {
	}
	@Get
	@Path("/lq")
	public List<Organization> query(@JdbcConn Connection con ,@Nullable String name,@DefaultValue("5") int rows) throws SQLException
	{
	public List<Organization> query(@JdbcConn Connection con,@Nullable String name,@DefaultValue("5") int rows) throws SQLException{
		if(name==null) name = "%";
		else name="%"+name+"%";
		return this.orgDao.limitQuery(con, name, rows);
	}
	
	@Get
	@Path("/querylimit")
	public List<EditOrganization> queryLimit(@JdbcConn Connection con,@Nullable String name,@DefaultValue("3") int rows)throws SQLException{
		if(name != null){
			name = "%" + name + "%";
		}
		List<EditOrganization> organizations = this.orgDao.queryLimit(con, name, rows);
		if(!organizations.isEmpty()){
			for (EditOrganization organization : organizations) {
				organization.setHasOrgLogo(this.imageService.hasOrgLogo(organization.getId()));
			}
		}
		return organizations;
	}
	
	public String createOrganization(Connection con, String orgName) throws SQLException, IOException {
		String id = StringUtil.buildUUID();
		Organization org = new Organization();

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

@@ -342,6 +342,19 @@ public class ProfessorService {
		return professor;
	}
	
	@Get
	@Path("/qaByName")
	public List<EditProfessor> queryByName(@JdbcConn Connection con,@Nullable String name,@DefaultValue("3") int total)throws SQLException {
		if(name != null){
			name = "%" + name + "%";
		}
		List<EditProfessor> professors = this.professorDao.queryByName(con, name, total);
		for (EditProfessor professor : professors) {
			professor.setHasHeadImage(this.imageService.hasProfessorImage(professor.getId()));
		}
		return professors;
	}
	
	@Get
	@Path("/editBaseInfo/{id}")
	public EditProfessor queryEditBaseInfo(@JdbcConn Connection con, @PathVar String id) throws SQLException {

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

@@ -3,6 +3,8 @@ package com.ekexiu.portal.service;
import java.io.IOException;
import java.sql.Connection;
import java.sql.SQLException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import org.jfw.apt.annotation.Autowrie;
@@ -29,6 +31,7 @@ import com.ekexiu.portal.pojo.EditProfessor;
@Path("/resource")
public class ResourceService {
	private String timeFormat = "yyyyMMddHHmmss";
	@Autowrie
	private ProfessorDao professorDao;
	@Autowrie
@@ -46,6 +49,14 @@ public class ResourceService {
	@Autowrie
	private GrowthLogService growthLogService;
	public String getTimeFormat() {
		return timeFormat;
	}
	public void setTimeFormat(String timeFormat) {
		this.timeFormat = timeFormat;
	}
	public ProfessorDao getProfessorDao() {
		return professorDao;
	}
@@ -109,6 +120,12 @@ public class ResourceService {
	public void setGrowthLogService(GrowthLogService growthLogService) {
		this.growthLogService = growthLogService;
	}
	
	private String publishTime(){
		SimpleDateFormat df = new SimpleDateFormat(this.timeFormat);
		String publishTime = df.format(new Date());
		return publishTime;
	}
	@Post
	@Path
@@ -124,6 +141,93 @@ public class ResourceService {
		return resourceId;
	}
	
	@Post
	@Path("/save")
	public String save(@JdbcConn(true) Connection con, Resource resource, @Nullable String[] fns) 
			throws JfwBaseException, SQLException, IOException {
		if(resource.getResourceId() == null){
			String resourceId = StringUtil.buildUUID();
			if(fns != null){
				this.imagesService.saveImg(con, resourceId, fns);
			}
			resource.setResourceId(resourceId);
			resource.setStatus("1");
			resource.setPublishTime(this.publishTime());
			this.resourceDao.insert(con, resource);
			//this.growthLogService.addResource(con, resource.getProfessorId());
			return resourceId;
		}else if(resource.getResourceId().trim().length() == 32){
			if(fns != null){
				this.imageDao.deleteRes(con, resource.getResourceId());
				this.imagesService.saveImg(con, resource.getResourceId(), fns);
			}
			this.resourceDao.update(con, resource);
			this.resourceDao.updatePublishTime(con, resource.getResourceId(), "1", this.publishTime());
			return resource.getResourceId();
		}else{
			throw new JfwBaseException(-1, "bad parameter:resourceId");
		}
	}
	
	@Post
	@Path("/draft")
	public String draft(@JdbcConn(true) Connection con, Resource resource, @Nullable String[] fns) 
			throws SQLException, IOException, JfwBaseException{
		if(resource.getResourceId() == null){
			String resourceId = StringUtil.buildUUID();
			if(fns != null){
				this.imagesService.saveImg(con, resourceId, fns);
			}
			resource.setResourceId(resourceId);
			resource.setStatus("0");
			this.resourceDao.insert(con, resource);
			return resourceId;
		}else if(resource.getResourceId().trim().length() == 32){
			if(fns != null){
				this.imageDao.deleteRes(con, resource.getResourceId());
				this.imagesService.saveImg(con, resource.getResourceId(), fns);
			}
			this.resourceDao.update(con, resource);
			this.resourceDao.updateStatus(con, resource.getResourceId(), "0");
			return resource.getResourceId();
		}else{
			throw new JfwBaseException(-1, "bad parameter:resourceId");
		}
	}
	
	@Post
	@Path("/timing")
	public String timing(@JdbcConn(true) Connection con, Resource resource, @Nullable String[] fns) 
			throws SQLException, IOException, JfwBaseException{
		if(resource.getResourceId() == null){
			String resourceId = StringUtil.buildUUID();
			if(fns != null){
				this.imagesService.saveImg(con, resourceId, fns);
			}
			resource.setResourceId(resourceId);
			resource.setStatus("2");
			this.resourceDao.insert(con, resource);
			return resourceId;
		}else if(resource.getResourceId().trim().length() == 32){
			if(fns != null){
				this.imageDao.deleteRes(con, resource.getResourceId());
				this.imagesService.saveImg(con, resource.getResourceId(), fns);
			}
			this.resourceDao.update(con, resource);
			this.resourceDao.updatePublishTime(con, resource.getResourceId(), "2", resource.getPublishTime());
			return resource.getResourceId();
		}else{
			throw new JfwBaseException(-1, "bad parameter:resourceId");
		}
	}
	
	@Post
	@Path("/delete")
	public void deleteRes(@JdbcConn(true) Connection con, String resourceId) throws SQLException{
		//修改资源状态为删除
		this.resourceDao.updateStatus(con, resourceId, "3");
	}
	
	@Post
	@Path("/saveRes")
	public String insertRes(@JdbcConn(true) Connection con, Resource resource, @Nullable String base64, Integer angle) 
@@ -147,7 +251,7 @@ public class ResourceService {
		}
		this.resourceDao.update(con, resource);
	}
	
	@Get
	@Path("/{resourceId}")
	public Resource query(@JdbcConn Connection con, @PathVar String resourceId) throws SQLException {
@@ -158,6 +262,21 @@ public class ResourceService {
		return resource;
	}
	
	@Get
	@Path("/queryOne")
	public Resource queryOne(@JdbcConn Connection con, String resourceId) throws SQLException {
		Resource resource = this.resourceDao.queryOne(con, resourceId);
		if(resource != null){
			resource.setImages(this.imageDao.queryRes(con, resourceId));
			EditProfessor professor = this.professorDao.queryBaseInfo(con, resource.getProfessorId());
			if(professor != null){
				professor.setHasHeadImage(this.imageService.hasProfessorImage(professor.getId()));
			}
			resource.setEditProfessor(professor);
		}
		return resource;
	}
	
	@Get
	@Path("/resourceInfo")
	public Resource queryInfo(@JdbcConn Connection con, String resourceId) throws SQLException {
@@ -185,6 +304,22 @@ public class ResourceService {
		return queryResult;
	}
	
	@Get
	@Path("/qaByName")
	public List<Resource> queryByName(@JdbcConn Connection con, @Nullable String resourceName, @DefaultValue("3") int rows) throws SQLException {
		if(resourceName != null){
			resourceName = "%" + resourceName + "%";
		}
		List<Resource> resources = this.resourceDao.queryByName(con, resourceName, rows);
		if(!resources.isEmpty()){
			for (Resource resource : resources) {
				resource.setImages(this.imageDao.queryRes(con, resource.getResourceId()));
				resource.setProfessor(this.professorDao.queryOne(con, resource.getProfessorId()));
			}
		}
		return resources;
	}
	
	@Get
	@Path("/qapro")
	public List<Resource> queryPro(@JdbcConn Connection con, String professorId) throws SQLException {

src/main/resources/project-test-dev.properties

@@ -142,6 +142,7 @@ com_ekexiu_portal_service_AccessoryService.accessoryPath::java.io.File=/kexiu/ww
com_ekexiu_portal_service_ImagesService.tmpPath::java.io.File=/kexiu/www/html1/images/tmp
#资源图片保存目录
com_ekexiu_portal_service_ImagesService.resourcePath::java.io.File=/kexiu/www/html1/images/resource
com_ekexiu_portal_service_ImagesService.resourceDataPath::java.io.File=/kexiu/webdata1/data/resource
#科研文章图片上传临时目录
com_ekexiu_portal_service_ArticleService.tmpPath::java.io.File=/kexiu/www/html1/images/tmp
#科研文章图片保存目录

src/main/resources/project-test.properties

@@ -142,6 +142,7 @@ com_ekexiu_portal_service_AccessoryService.accessoryPath::java.io.File=/kexiu/ww
com_ekexiu_portal_service_ImagesService.tmpPath::java.io.File=/kexiu/www/html/images/tmp
#资源图片保存目录
com_ekexiu_portal_service_ImagesService.resourcePath::java.io.File=/kexiu/www/html/images/resource
com_ekexiu_portal_service_ImagesService.resourceDataPath::java.io.File=/kexiu/webdata/data/resource
#科研文章图片上传临时目录
com_ekexiu_portal_service_ArticleService.tmpPath::java.io.File=/kexiu/www/html/images/tmp
#科研文章图片保存目录

src/main/resources/project.properties

@@ -142,6 +142,7 @@ com_ekexiu_portal_service_AccessoryService.accessoryPath::java.io.File=/kexiu/ww
com_ekexiu_portal_service_ImagesService.tmpPath::java.io.File=/kexiu/www/html/images/tmp
#资源图片保存目录
com_ekexiu_portal_service_ImagesService.resourcePath::java.io.File=/kexiu/www/html/images/resource
com_ekexiu_portal_service_ImagesService.resourceDataPath::java.io.File=/kexiu/webdata/data/resource
#科研文章图片上传临时目录
com_ekexiu_portal_service_ArticleService.tmpPath::java.io.File=/kexiu/www/html/images/tmp
#科研文章图片保存目录