--资源搜索页搜索条件添加认证专家(只有认证专家发布的资源可以显示在搜索列表)；保存和更新资源时资源图片多存一张最大尺寸为240的图片。

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

@@ -1,6 +1,9 @@
package com.ekexiu.portal.service;
import java.awt.geom.AffineTransform;
import java.awt.image.AffineTransformOp;
import java.awt.image.BufferedImage;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileInputStream;
@@ -14,6 +17,7 @@ import java.util.List;
import javax.imageio.ImageIO;
import org.jfw.util.codec.Base64;
import org.jfw.util.exception.JfwBaseException;
import org.jfw.apt.annotation.Autowrie;
import org.jfw.apt.web.annotation.Path;
import org.jfw.apt.web.annotation.operate.Delete;
@@ -22,6 +26,7 @@ import org.jfw.apt.web.annotation.operate.Post;
import org.jfw.apt.web.annotation.operate.Put;
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.io.IoUtil;
@@ -33,6 +38,7 @@ import com.ekexiu.portal.util.PictureRotating;
public class ImagesService {
	private File tmpPath;
	private File resourcePath;
	private int resImageMaxLen = 240;
	@Autowrie
	private ImageDao imageDao;
	
@@ -52,6 +58,14 @@ public class ImagesService {
		this.resourcePath = resourcePath;
	}
	public int getResImageMaxLen() {
		return resImageMaxLen;
	}
	public void setResImageMaxLen(int resImageMaxLen) {
		this.resImageMaxLen = resImageMaxLen;
	}
	public ImageDao getImageDao() {
		return imageDao;
	}
@@ -60,15 +74,50 @@ public class ImagesService {
		this.imageDao = imageDao;
	}
	
	@Post
	@Path("/resourceImg")
	public String insert(@JdbcConn(true) Connection con, String resourceId, String fn) throws SQLException, IOException {
		InputStream in = new FileInputStream(new File(this.tmpPath, fn));
	/**
	 * 图片按比例缩放
	 * @param src 原图片
	 * @param maxLen 最长一边的长度
	 * @return 返回缩放后的图片
	 * @throws IOException
	 */
	public static byte[] resImage(byte[] src, int maxLen) throws IOException{
		ByteArrayInputStream in = new ByteArrayInputStream(src);
		ByteArrayOutputStream out = new ByteArrayOutputStream();
		BufferedImage bi = ImageIO.read(in);
	    double max = bi.getWidth()>bi.getHeight()?bi.getWidth():bi.getHeight();
	    double scaling = maxLen/max;
	    AffineTransformOp ato = new AffineTransformOp(AffineTransform.getScaleInstance(scaling,scaling), null);
		java.awt.Image Itemp = ato.filter(bi, null);
		ImageIO.write((BufferedImage) Itemp, "jpg", out);
		out.flush();
		return out.toByteArray();
	}
	
	private byte[] readTmpFile(String fn) throws JfwBaseException {
		File file = new File(this.tmpPath, fn);
		if (!file.exists())
			throw new JfwBaseException(90, "resource image not exists");
		try {
			IoUtil.copy(in, new FileOutputStream(new File(this.resourcePath, resourceId + ".jpg")), false, true);
		} finally {
			in.close();
			InputStream in = new FileInputStream(file);
			ByteArrayOutputStream out = new ByteArrayOutputStream();
			IoUtil.copy(in, out, true, true);
			return out.toByteArray();
		} catch (IOException e) {
			throw new JfwBaseException(91, "read temp resource image error", e);
		}
	}
	
	@Post
	@Path("/resourceImg")
	public String insert(@JdbcConn(true) Connection con, String resourceId, String fn) 
			throws SQLException, IOException, JfwBaseException {
		byte[] src = this.readTmpFile(fn);
		src = JpgUtil.read(src);
		byte[] shareResImage = resImage(src, this.resImageMaxLen);
		IoUtil.saveStream(new FileOutputStream(new File(this.resourcePath, resourceId + ".jpg")), src, true);
		IoUtil.saveStream(new FileOutputStream(new File(this.resourcePath, resourceId + "_s.jpg")), shareResImage, true);
		
		Image image1 = this.imageDao.queryOne(con, resourceId);
		if(null == image1){
			Image image = new Image();
@@ -90,10 +139,14 @@ public class ImagesService {
		Base64 bs64 = new Base64();
		byte[] bs = bs64.decode(base64.getBytes("UTF-8"));
		String imageSrc = this.resourcePath + "/" + resourceId + ".jpg";
		String resImage = this.resourcePath + "/" + resourceId + "_s.jpg";
		FileOutputStream fos = new FileOutputStream(imageSrc);
		FileOutputStream fos2 = new FileOutputStream(resImage);
		try {
			if(0 == angle){
				byte[] bytes = resImage(bs, this.resImageMaxLen);
				fos.write(bs);
				fos2.write(bytes);
			}else{
				java.awt.Image image = PictureRotating.bytesToBufferedImage(bs);
				BufferedImage des = PictureRotating.Rotate(image, angle);
@@ -101,11 +154,15 @@ public class ImagesService {
				@SuppressWarnings("unused")
				boolean flag = ImageIO.write(des, "jpg", out);
				byte[] bytes = out.toByteArray();
				byte[] bs2 = resImage(bytes, this.resImageMaxLen);
				fos.write(bytes);
				fos2.write(bs2);
			}
			fos.flush();
			fos2.flush();
		} finally {
			fos.close();
			fos2.close();
		}
		Image image1 = this.imageDao.queryOne(con, resourceId);
		if(null == image1){

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

@@ -16,6 +16,7 @@ import org.jfw.apt.web.annotation.param.JdbcConn;
import org.jfw.apt.web.annotation.param.PathVar;
import org.jfw.util.PageQueryResult;
import org.jfw.util.StringUtil;
import org.jfw.util.exception.JfwBaseException;
import com.ekexiu.portal.dao.ImageDao;
import com.ekexiu.portal.dao.OperationDao;
@@ -101,49 +102,34 @@ public class ResourceService {
	@Post
	@Path
	public String insert(@JdbcConn(true) Connection con, Resource resource, @Nullable String fn) {
	public String insert(@JdbcConn(true) Connection con, Resource resource, @Nullable String fn) 
			throws JfwBaseException, SQLException, IOException {
		String resourceId = StringUtil.buildUUID();
		try {
			if(null != fn){
				this.imagesService.insert(con, resourceId, fn);
			}
			resource.setResourceId(resourceId);
			this.resourceDao.insert(con, resource);
		} catch (SQLException | IOException e) {
			try {
				con.rollback();
			} catch (SQLException e1) {
				e1.printStackTrace();
			}
			e.printStackTrace();
		if(null != fn){
			this.imagesService.insert(con, resourceId, fn);
		}
		resource.setResourceId(resourceId);
		this.resourceDao.insert(con, resource);
		return resourceId;
	}
	
	@Post
	@Path("/saveRes")
	public String insertRes(@JdbcConn(true) Connection con, Resource resource, @Nullable String base64, Integer angle) {
	public String insertRes(@JdbcConn(true) Connection con, Resource resource, @Nullable String base64, Integer angle) 
			throws SQLException, IOException {
		String resourceId = StringUtil.buildUUID();
		try {
			if(null != base64){
				this.imagesService.insertResourceImg(con, resourceId, base64, angle);
			}
			resource.setResourceId(resourceId);
			this.resourceDao.insert(con, resource);
		} catch (SQLException | IOException e) {
			try {
				con.rollback();
			} catch (SQLException e1) {
				e1.printStackTrace();
			}
			e.printStackTrace();
		if(null != base64){
			this.imagesService.insertResourceImg(con, resourceId, base64, angle);
		}
		resource.setResourceId(resourceId);
		this.resourceDao.insert(con, resource);
		return resourceId;
	}
	@Post
	@Path("/updateResource")
	public void update(@JdbcConn(true) Connection con, Resource resource, @Nullable String fn) throws SQLException, IOException {
	public void update(@JdbcConn(true) Connection con, Resource resource, @Nullable String fn) 
			throws SQLException, IOException, JfwBaseException {
		if(null != fn){
			this.imagesService.insert(con, resource.getResourceId(), fn);
		}
@@ -254,7 +240,7 @@ public class ResourceService {
	@Path("/pqRes")
	public PageQueryResult<Resource> queryPageRes(@JdbcConn(false) Connection con, @Nullable String key, 
			@Nullable String subject, @Nullable String industry, @Nullable String province, @Nullable String address, 
			@Nullable Integer authType, @DefaultValue("10") int pageSize, @DefaultValue("1") int pageNo) throws SQLException {
			@DefaultValue("1") Integer authType, @DefaultValue("10") int pageSize, @DefaultValue("1") int pageNo) throws SQLException {
		if(key!=null) key="%"+key+"%";
		if(subject!=null) subject ="%"+subject+"%";
		if(industry!=null)industry="%"+industry+"%";
@@ -274,7 +260,7 @@ public class ResourceService {
	@Get
	@Path("/pq")
	public PageQueryResult<Resource> queryPage(@JdbcConn(false) Connection con, @Nullable String key, 
			@Nullable String subject, @Nullable String industry, @Nullable String address,@Nullable Integer authType, 
			@Nullable String subject, @Nullable String industry, @Nullable String address,@DefaultValue("1") Integer authType, 
			@DefaultValue("10") int pageSize, @DefaultValue("1") int pageNo) throws SQLException {
		if(key!=null) key="%"+key+"%";
		if(subject!=null) subject ="%"+subject+"%";