--update Article.class and Article config.

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

@@ -4,12 +4,14 @@ import java.sql.Connection;
import java.sql.SQLException;
import java.util.List;
import org.jfw.apt.annotation.Nullable;
import org.jfw.apt.orm.annotation.dao.DAO;
import org.jfw.apt.orm.annotation.dao.method.From;
import org.jfw.apt.orm.annotation.dao.method.OrderBy;
import org.jfw.apt.orm.annotation.dao.method.operator.DeleteWith;
import org.jfw.apt.orm.annotation.dao.method.operator.Insert;
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.Set;
@@ -41,7 +43,11 @@ public abstract class ArticleDao {
	public abstract int deletePro(Connection con, String professorId) throws SQLException;
	
	@SelectList
	@OrderBy(" ORDER BY CREATE_TIME DESC ")
	@OrderBy(" ORDER BY MODIFY_TIME DESC ")
	public abstract List<Article> queryPro(Connection con, String professorId) throws SQLException;
	
	@SelectOne
	@Nullable
	public abstract Article queryOne(Connection con, String articleId) throws SQLException;
}

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

@@ -7,6 +7,7 @@ import org.jfw.apt.orm.core.enums.DE;
import com.ekexiu.portal.basepo.CreateTimeSupported;
import com.ekexiu.portal.basepo.ModifyTimeSupported;
import com.ekexiu.portal.pojo.EditProfessor;
@Table
@PrimaryKey("articleId")
@@ -20,6 +21,7 @@ public class Article implements CreateTimeSupported, ModifyTimeSupported {
	private String createTime;
	private String modifyTime;
	private String articleImg;
	private EditProfessor professor;
	
	@Column(DE.id_32)
	public String getArticleId() {
@@ -82,5 +84,11 @@ public class Article implements CreateTimeSupported, ModifyTimeSupported {
	public void setArticleImg(String articleImg) {
		this.articleImg = articleImg;
	}
	public EditProfessor getProfessor() {
		return professor;
	}
	public void setProfessor(EditProfessor professor) {
		this.professor = professor;
	}
}

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

@@ -14,29 +14,42 @@ import java.util.Date;
import java.util.List;
import org.jfw.apt.annotation.Autowrie;
import org.jfw.apt.annotation.Nullable;
import org.jfw.apt.web.annotation.Path;
import org.jfw.apt.web.annotation.operate.Delete;
import org.jfw.apt.web.annotation.operate.Get;
import org.jfw.apt.web.annotation.operate.Post;
import org.jfw.apt.web.annotation.param.JdbcConn;
import org.jfw.apt.web.annotation.param.PathVar;
import org.jfw.util.JpgUtil;
import org.jfw.util.StringUtil;
import org.jfw.util.exception.JfwBaseException;
import org.jfw.util.io.IoUtil;
import com.ekexiu.portal.dao.ArticleDao;
import com.ekexiu.portal.dao.ProfessorDao;
import com.ekexiu.portal.dao.ResourceDao;
import com.ekexiu.portal.po.Article;
import com.ekexiu.portal.pojo.EditProfessor;
@Path("/article")
public class ArticleService {
	private File tmpPath;
	private File articlePath;
	private String dateFormat = "yyyyMMdd";
	private int artMaxLen=640;
	private static final String JPG = "jpg";
	@Autowrie
	private ArticleDao articleDao;
	@Autowrie
	private ProfessorDao professorDao;
	@Autowrie
	private ResourceDao resourceDao;
	public String getDateFormat() {
		return dateFormat;
	}
	public void setDateFormat(String dateFormat) {
		this.dateFormat = dateFormat;
	}
	public File getTmpPath() {
		return tmpPath;
@@ -70,6 +83,22 @@ public class ArticleService {
		this.articleDao = articleDao;
	}
	
	public ProfessorDao getProfessorDao() {
		return professorDao;
	}
	public void setProfessorDao(ProfessorDao professorDao) {
		this.professorDao = professorDao;
	}
	public ResourceDao getResourceDao() {
		return resourceDao;
	}
	public void setResourceDao(ResourceDao resourceDao) {
		this.resourceDao = resourceDao;
	}
	private byte[] resImage(byte[] src, int maxLen) throws IOException {
		ByteArrayInputStream in = new ByteArrayInputStream(src);
		ByteArrayOutputStream out = new ByteArrayOutputStream();
@@ -96,21 +125,20 @@ public class ArticleService {
		byte[] src = this.readTmpFile(fn);
		src = JpgUtil.read(src);
		byte[] shareResImage = this.resImage(src, this.artMaxLen);
		File savePath = this.createDate(this.articlePath);
		IoUtil.saveStream(new FileOutputStream(new File(savePath, id + "." + JPG)), src, true);
		IoUtil.saveStream(new FileOutputStream(new File(savePath, id + "_s." + JPG)), shareResImage, true);
	}
	
	private File createDate(File path){
		SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-DD");
		String date = df.format(new Date());
		String datePath = path + "/" +  date;
		File dateFile = new File(datePath);
		String savePath = this.articlePath + "/" + this.createDate();
		File dateFile = new File(savePath);
		if (!dateFile.exists()) {
			// 创建日期目录
			dateFile.mkdir();
		}
		return dateFile;
		IoUtil.saveStream(new FileOutputStream(new File(dateFile, id + "." + JPG)), src, true);
		IoUtil.saveStream(new FileOutputStream(new File(dateFile, id + "_s." + JPG)), shareResImage, true);
	}
	
	private String createDate(){
		SimpleDateFormat df = new SimpleDateFormat(this.dateFormat);
		String date = df.format(new Date());
		return date;
	}
	
	@Post
@@ -120,7 +148,7 @@ public class ArticleService {
		String articleId = StringUtil.buildUUID();
		if(article.getArticleImg() != null){
			this.saveArtImg(article.getArticleImg(), articleId);
			article.setArticleImg(this.createDate(this.articlePath)+"/"+articleId+"."+JPG);
			article.setArticleImg(this.createDate()+"/"+articleId+"."+JPG);
		}
		article.setArticleId(articleId);
		this.articleDao.insert(con, article);
@@ -133,32 +161,34 @@ public class ArticleService {
			throws SQLException, JfwBaseException, IOException{
		if(article.getArticleImg() != null){
			this.saveArtImg(article.getArticleImg(), article.getArticleId());
			article.setArticleImg(this.createDate(this.articlePath)+"/"+article.getArticleId()+"."+JPG);
			article.setArticleImg(this.createDate()+"/"+article.getArticleId()+"."+JPG);
		}
		this.articleDao.update(con, article);
	}
	
	@Post
	@Path("/subject")
	public void updateSubject(@JdbcConn(true) Connection con, @Nullable String subject, String articleId) throws SQLException{
		this.articleDao.updateSubject(con, subject, articleId);
	}
	
	@Post
	@Path("/industry")
	public void updateIndustry(@JdbcConn(true) Connection con, @Nullable String industry, String articleId) throws SQLException{
		this.articleDao.updateIndustry(con, industry, articleId);
	}
	
	@Get
	@Path("/qaPro")
	public List<Article> queryPro(@JdbcConn Connection con, String professorId) throws SQLException{
		return this.articleDao.queryPro(con, professorId);
	}
	
	@Delete
	@Path("/{articleId}")
	public void delete(@JdbcConn(true) Connection con, @PathVar String articleId) throws SQLException{
	@Get
	@Path("/query")
	public Article queryOne(@JdbcConn Connection con, String articleId) throws SQLException{
		Article article = this.articleDao.queryOne(con, articleId);
		if(article != null){
			EditProfessor professor = this.professorDao.queryBaseInfo(con, article.getProfessorId());
			if(professor != null){
				professor.setResources(this.resourceDao.queryPro(con, professor.getId()));
			}
			article.setProfessor(professor);
		}
		return article;
	}
	
	@Post
	@Path("/delete")
	public void delete(@JdbcConn(true) Connection con, String articleId) throws SQLException{
		this.articleDao.delete(con, articleId);
	}

src/main/resources/project-test.properties

@@ -117,7 +117,8 @@ com_ekexiu_portal_service_ImagesService.resourcePath::java.io.File=/kexiu/www/ht
#科研文章图片上传临时目录
com_ekexiu_portal_service_ArticleService.tmpPath::java.io.File=/kexiu/www/html/images/tmp
#科研文章图片保存目录
com_ekexiu_portal_service_ArticleService.articlePath::java.io.File=/kexiu/www/html/images/article
com_ekexiu_portal_service_ArticleService.articlePath::java.io.File=/kexiu/webdata/data/article
com_ekexiu_portal_service_ArticleService.dateFormat::java.lang.String=yyyyMMdd
#科研文章图片尺寸
com_ekexiu_portal_service_ArticleService.artMaxLen::int=640
#资源分享图片尺寸

src/main/resources/project.properties

@@ -117,7 +117,8 @@ com_ekexiu_portal_service_ImagesService.resourcePath::java.io.File=/kexiu/www/ht
#科研文章图片上传临时目录
com_ekexiu_portal_service_ArticleService.tmpPath::java.io.File=/kexiu/www/html/images/tmp
#科研文章图片保存目录
com_ekexiu_portal_service_ArticleService.articlePath::java.io.File=/kexiu/www/html/images/article
com_ekexiu_portal_service_ArticleService.articlePath::java.io.File=/kexiu/webdata/data/article
com_ekexiu_portal_service_ArticleService.dateFormat::java.lang.String=yyyyMMdd
#科研文章图片尺寸
com_ekexiu_portal_service_ArticleService.artMaxLen::int=640
#资源分享图片尺寸