Merge branch 'master' of http://git3.nong12.com/xtrade/order-service.git

zhangxing
2 parents e17741d6 ecf58492
Showing 11 changed files with 221 additions and 12 deletions
src/main/java/com/diligrp/xtrade/product/common/utils/ImageUtil.java
src/main/java/com/diligrp/xtrade/product/controllor/CategoryController.java
src/main/java/com/diligrp/xtrade/product/domain/builder/MerchantBuilder.java
src/main/java/com/diligrp/xtrade/product/domain/dto/CategoryDto.java
src/main/java/com/diligrp/xtrade/product/domain/dto/CategoryQueryDto.java
src/main/java/com/diligrp/xtrade/product/domain/entity/CategoryDo.java
src/main/java/com/diligrp/xtrade/product/exception/ExceptionEnum.java
src/main/java/com/diligrp/xtrade/product/exception/ProductException.java
src/main/java/com/diligrp/xtrade/product/repository/MerchantRepository.java
src/main/java/com/diligrp/xtrade/product/service/impl/CategoryServiceImpl.java
src/main/java/com/diligrp/xtrade/product/service/impl/MerchantServiceImpl.java
+package com.diligrp.xtrade.product.common.utils;
+
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+import java.io.InputStream;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+
+import javax.imageio.ImageIO;
+
+import com.diligrp.xtrade.product.exception.ExceptionEnum;
+import com.diligrp.xtrade.product.exception.ProductException;
+
+
+/**
+ * 
+ * <B>Description</B> 图片工具类 <br />
+ * <B>Copyright</B> Copyright (c) 2015 www.diligrp.com All rights reserved. <br />
+ * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
+ * <B>Company</B> 地利集团
+ * @createTime 2015年4月24日 上午11:30:36
+ * @author celine
+ */
+public class ImageUtil {
+
+    /**
+     * 检测文件是否是图片
+     * @param inputStream
+     * @return
+     * @createTime 2015年4月24日 上午11:35:29
+     * @author celine
+     */
+    public static Boolean isImage(InputStream inputStream) {
+        try {
+            BufferedImage bi = ImageIO.read(inputStream);
+            return null == bi ? false : true;
+        } catch (IOException e) {
+            throw new ProductException(ExceptionEnum.FILE_UP_ERROR);		
+        }
+    }
+
+    public static Boolean checkImageSize(InputStream inputStream, int maxWidth, int maxHeight, int minWidth,
+            int minHeight) {
+        try {
+            BufferedImage bi = ImageIO.read(inputStream);
+            if (bi != null) {
+                if (bi.getWidth() <= maxWidth && bi.getHeight() <= maxHeight && bi.getWidth() >= minWidth
+                        && bi.getHeight() >= minHeight) {
+                    return true;
+                }
+            }
+            return false;
+        } catch (IOException e) {
+        	throw new ProductException(ExceptionEnum.FILE_UP_ERROR);	
+        }
+    }
+
+    public static String getMd5(byte[] imgBytes) {
+        if (imgBytes != null && imgBytes.length > 0) {
+            StringBuilder sb = new StringBuilder();
+            MessageDigest md5;
+            try {
+                md5 = MessageDigest.getInstance("MD5");
+            } catch (NoSuchAlgorithmException e) {
+            	throw new ProductException(ExceptionEnum.FILE_UP_ERROR);	
+            }
+            md5.update(imgBytes);
+            for (byte by : md5.digest()) {
+                sb.append(String.format("%02X", by));
+            }
+            return sb.toString();
+        }
+        return "";
+    }
+
+}
 package com.diligrp.xtrade.product.controllor;
  
+import java.io.IOException;
 import java.util.List;
  
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
  
+import com.diligrp.xtrade.product.common.utils.ImageUtil;
 import com.diligrp.xtrade.product.domain.dto.CategoryDto;
 import com.diligrp.xtrade.product.domain.entity.CategoryDo;
+import com.diligrp.xtrade.product.exception.ExceptionEnum;
+import com.diligrp.xtrade.product.exception.ProductException;
 import com.diligrp.xtrade.product.service.CategoryService;
 import com.diligrp.xtrade.shared.domain.Message;
  
@@ -21,7 +30,15 @@ import com.diligrp.xtrade.shared.domain.Message;
 @RestController
 @RequestMapping("sapi/category/")
 public class CategoryController {
+	
+	@Value("${max.file.size}")
+	private int MAX_FILE_SIZE;
  
+	private final Integer MAX_WIDTH = 300;
+	private final Integer MAX_HEIGHT = 300;
+	private final Integer MIN_WIDTH = 200;
+	private final Integer MIN_HEIGHT = 200;
+	
 	@Autowired
 	private CategoryService categoryService;
  
@@ -33,7 +50,14 @@ public class CategoryController {
 	 * @return
 	 * @throws
 	 */
-	public Message<?> save(CategoryDto categoryDTO) {
+	@RequestMapping("save")
+	public Message<?> save(@RequestBody CategoryDto categoryDTO,@RequestParam(value = "file",required = false) MultipartFile file) {
+		checkImageFile(file);
+		try {
+			categoryDTO.setImage(file.getBytes());
+		} catch (IOException e) {
+			throw new ProductException(ExceptionEnum.FILE_UP_ERROR);
+		}
 		categoryService.insert(categoryDTO);
 		return Message.success();
 	}
@@ -93,4 +117,29 @@ public class CategoryController {
 		List<CategoryDo> categoryDos = categoryService.selectCateChild(cateCode);
 		return Message.success(categoryDos);
 	}
+	
+	/**
+	 * 
+	 * @Title checkImageFile
+	 * @Description 文件检查
+	 * @param file
+	 * @throws
+	 */
+	private void checkImageFile(MultipartFile file) {
+		try {
+			if (!ImageUtil.isImage(file.getInputStream())) {
+				throw new ProductException(ExceptionEnum.NOT_IMAGE);
+			}
+			if (!ImageUtil.checkImageSize(file.getInputStream(), MAX_WIDTH, MAX_HEIGHT, MIN_WIDTH, MIN_HEIGHT)) {
+				
+				throw new ProductException(200005,"上传图片长宽超过限制，请保证图片大小范围为" + MIN_WIDTH + "*" + MIN_HEIGHT + "到" + MAX_WIDTH + "*"
+						+ MAX_HEIGHT);
+			}
+			if (file.getBytes().length > MAX_FILE_SIZE) {
+				new ProductException(200005,"上传图片大小超过限制,请保证图片不超过256K");
+			}
+		} catch (IOException e) {
+			throw new ProductException(ExceptionEnum.FILE_UP_ERROR);
+		}
+	}
 }
@@ -19,7 +19,7 @@ public class MerchantBuilder {
     public static MerchantDo buildDoFromRequest(MerchantRequestDto requestDto) {
         Integer type = Optional.ofNullable(requestDto.getAccountType())
                 .map(AccountType::getCode)
-                .orElse(0);
+                .orElse(null);
         MerchantDo merchantDo = new MerchantDo();
         merchantDo.setMerName(requestDto.getMerchantName());
         merchantDo.setAccountId(requestDto.getAccountId());
@@ -37,7 +37,7 @@ public class CategoryDto{
 	/**
 	 * 图片
 	 */
-	private String image;
+	private byte[] image;
 	/**
 	 * 品类有效期
 	 */
@@ -50,7 +50,10 @@ public class CategoryDto{
 	 * 品类等级
 	 */
 	private Integer level;
-	
+	/**
+	 * 市场id
+	 */
+	private Integer marketId;
 	public String getParentId() {
 		return parentId;
 	}
@@ -93,10 +96,11 @@ public class CategoryDto{
 	public void setIcon(String icon) {
 		this.icon = icon;
 	}
-	public String getImage() {
+	
+	public byte[] getImage() {
 		return image;
 	}
-	public void setImage(String image) {
+	public void setImage(byte[] image) {
 		this.image = image;
 	}
 	public Integer getValidDay() {
@@ -117,5 +121,11 @@ public class CategoryDto{
 	public void setLevel(Integer level) {
 		this.level = level;
 	}
+	public Integer getMarketId() {
+		return marketId;
+	}
+	public void setMarketId(Integer marketId) {
+		this.marketId = marketId;
+	}
  
 }
@@ -34,6 +34,10 @@ public class CategoryQueryDto{
 	 * 品类等级
 	 */
 	private Integer level;
+	/**
+	 * 市场id
+	 */
+	private Integer marketId;
  
 	private Integer currentPage;
  
@@ -79,5 +83,11 @@ public class CategoryQueryDto{
 	public void setCurrentPage(Integer currentPage) {
 		this.currentPage = currentPage;
 	}
+	public Integer getMarketId() {
+		return marketId;
+	}
+	public void setMarketId(Integer marketId) {
+		this.marketId = marketId;
+	}
  
 }
@@ -36,7 +36,7 @@ public class CategoryDo extends BaseDo{
 	/**
 	 * 图片
 	 */
-	private String image;
+	private byte[] image;
 	/**
 	 * 品类有效期
 	 */
@@ -49,6 +49,10 @@ public class CategoryDo extends BaseDo{
 	 * 品类等级
 	 */
 	private Integer level;
+	/**
+	 * 市场id
+	 */
+	private Integer marketId;
  
 	public String getCateCode() {
 		return cateCode;
@@ -86,10 +90,11 @@ public class CategoryDo extends BaseDo{
 	public void setIcon(String icon) {
 		this.icon = icon;
 	}
-	public String getImage() {
+	
+	public byte[] getImage() {
 		return image;
 	}
-	public void setImage(String image) {
+	public void setImage(byte[] image) {
 		this.image = image;
 	}
 	public Integer getValidDay() {
@@ -110,5 +115,11 @@ public class CategoryDo extends BaseDo{
 	public void setLevel(Integer level) {
 		this.level = level;
 	}
+	public Integer getMarketId() {
+		return marketId;
+	}
+	public void setMarketId(Integer marketId) {
+		this.marketId = marketId;
+	}
  
 }
@@ -2,6 +2,8 @@ package com.diligrp.xtrade.product.exception;
  
 import java.util.Arrays;
  
+import javax.validation.constraints.NotBlank;
+
 import com.diligrp.xtrade.shared.type.IEnumType;
  
 /**
@@ -14,6 +16,9 @@ public enum ExceptionEnum implements IEnumType {
 	SHOP_NOT_EXISTENCE(200001, "SHOP_NOT_EXISTENCE"),
 	MERCHANT_ACCOUNT_EXIST(200002,"商户账号已存在"),
 	CARD_MERCHANT_CREATED(200003,"该卡已创建商户，请使用用户名密码登录"),
+	CATE_EXISTENCE(200004,"品类已存在"),
+	FILE_UP_ERROR(200005,"文件上传失败"),
+	NOT_IMAGE(200006,"只能上传图片")
 	;
  
 	private int code;
@@ -8,4 +8,7 @@ public class ProductException extends BaseBusinessException {
     public ProductException(IEnumType type) {
         super(type);
     }
+    public ProductException(int code, String message) {
+        super(code,message);
+    }
 }
@@ -42,12 +42,11 @@ public class MerchantRepository implements IMerchantRepository {
     public void add(MerchantDo newMerchantDo) {
         IKeyGenerator keyGenerator = keyGeneratorManager.getKeyGenerator(IKeyGeneratorKeys.MERCHANT_SEQUENCE);
         newMerchantDo.setMerId(keyGenerator.nextId());
-        newMerchantDo.setMarketId("SY001");
         merchantDao.insert(newMerchantDo);
     }
  
     @Override
     public void update(MerchantDo merchantDo) {
-
+        merchantDao.update(merchantDo);
     }
 }
@@ -7,11 +7,14 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
  
+import com.diligrp.xtrade.product.common.utils.ImageUtil;
 import com.diligrp.xtrade.product.dao.CategoryDao;
 import com.diligrp.xtrade.product.domain.dto.CategoryDto;
 import com.diligrp.xtrade.product.domain.dto.CategoryQueryDto;
 import com.diligrp.xtrade.product.domain.emuns.IKeyGeneratorKeys;
 import com.diligrp.xtrade.product.domain.entity.CategoryDo;
+import com.diligrp.xtrade.product.exception.ExceptionEnum;
+import com.diligrp.xtrade.product.exception.ProductException;
 import com.diligrp.xtrade.product.service.CategoryService;
 import com.diligrp.xtrade.shared.sequence.KeyGeneratorManager;
  
@@ -29,9 +32,15 @@ public class CategoryServiceImpl implements CategoryService {
 	@Autowired
 	private CategoryDao categoryDao;
  
+	private static String ICON_PREFIX = "/mobile/category/getImageByIcon/";
+	
 	@Override
 	public void insert(CategoryDto category) {
 		CategoryDo categoryDo = new CategoryDo();
+		// 查询品类名是否存在
+		if(categoryIsExit(category)) {
+			throw new ProductException(ExceptionEnum.CATE_EXISTENCE);
+		}
 		BeanUtils.copyProperties(category, categoryDo);
 		long id = keyGeneratorManager.getKeyGenerator(IKeyGeneratorKeys.CATEGORY_SEQUENCE).nextId();
 		String cateCode = ""+id;
@@ -41,12 +50,17 @@ public class CategoryServiceImpl implements CategoryService {
 			cateCode = String.format("%s_%d", pCategoryDo.getCateCode(),id);
 		}
 		categoryDo.setCateCode(cateCode);
+		category.setIcon(ICON_PREFIX + ImageUtil.getMd5(categoryDo.getImage()) + id);
 		categoryDao.insert(categoryDo);
 	} 
  
 	@Override
 	public void update(CategoryDto category) {
 		CategoryDo categoryDo = new CategoryDo();
+		// 查询品类名是否存在
+		if(categoryIsExit(category)) {
+			throw new ProductException(ExceptionEnum.CATE_EXISTENCE);
+		}
 		BeanUtils.copyProperties(category, categoryDo);
 		categoryDao.update(categoryDo);
 	}
@@ -70,5 +84,24 @@ public class CategoryServiceImpl implements CategoryService {
 	public List<CategoryDo> selectCateChild(String cateCode) {
 		return categoryDao.selectCateChild(cateCode);
 	}
-
+	
+	/**
+	 * 根据品类名称,等级,市场查询品类名是否重复
+	 * @Title categoryIsExit
+	 * @Description 根据品类名称,等级,市场查询品类名是否重复
+	 * @param category
+	 * @return true/false
+	 * @throws
+	 */
+	private boolean categoryIsExit(CategoryDto category) {
+		CategoryQueryDto categoryQueryDto = new CategoryQueryDto();
+		categoryQueryDto.setCname(category.getCname());
+		categoryQueryDto.setLevel(category.getLevel());
+		categoryQueryDto.setMarketId(category.getMarketId());
+		List<CategoryDo> categorys = categoryDao.selectList(categoryQueryDto);
+		if(categorys != null && categorys.size() > 0) {
+			return true;
+		}
+		return false;
+	}
 }
@@ -18,6 +18,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
  
+import java.util.Optional;
+
 @Service
 public class MerchantServiceImpl implements MerchantService {
     @Autowired
@@ -42,11 +44,14 @@ public class MerchantServiceImpl implements MerchantService {
         MerchantDo merchantDo = merchantRepository.getByAccountId(requestDto.getAccountId());
         if (merchantDo == null){
             merchantDo = MerchantBuilder.buildDoFromRequest(requestDto);
+            merchantDo.setMarketId("SYSGDL");
             merchantRepository.add(merchantDo);
         } else {
             if (AccountType.PERSONAL.getCode() != merchantDo.getType()){
                 throw new ProductException(ExceptionEnum.CARD_MERCHANT_CREATED);
             }
+            this.updateMerchant(merchantDo, requestDto);
+            merchantRepository.update(merchantDo);
             shopService.updateShopTypeWithMerchant(merchantDo);
         }
         //创建市场管理员账户
@@ -54,4 +59,12 @@ public class MerchantServiceImpl implements MerchantService {
         return MerchantBuilder.buildResponseFromDo(merchantDo);
     }
  
+    private void updateMerchant(MerchantDo merchantDo, MerchantRequestDto requestDto) {
+        Integer accountType = Optional.ofNullable(requestDto.getAccountType())
+                .map(AccountType::getCode).orElse(null);
+        merchantDo.setMerName(requestDto.getMerchantName());
+        merchantDo.setAccountId(requestDto.getAccountId());
+        merchantDo.setType(accountType);
+        merchantDo.setDescription(requestDto.getAddress());
+    }
 }