参数验证

yangfan
1 parent 88309b95
Showing 2 changed files with 22 additions and 14 deletions
src/main/java/com/diligrp/xtrade/product/controllor/CategoryController.java
src/main/java/com/diligrp/xtrade/product/controllor/ShopController.java
@@ -5,6 +5,7 @@ import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -20,6 +21,7 @@ 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;
+import com.diligrp.xtrade.shared.util.AssertUtils;
 /**
  * @ClassName: CategoryController
@@ -51,7 +53,7 @@ public class CategoryController {
 	 * @throws
 	 */
 	@RequestMapping("save")
-	public Message<?> save(CategoryDto categoryDTO) {
+	public Message<?> save(@Validated CategoryDto categoryDTO) {
 		checkImageFile(categoryDTO.getImage());		
 		categoryService.insert(categoryDTO);
 		return Message.success();
@@ -66,7 +68,7 @@ public class CategoryController {
 	 * @throws
 	 */
 	@RequestMapping("update")
-	public Message<Object> update(CategoryDto categoryDTO) {
+	public Message<Object> update(@Validated CategoryDto categoryDTO) {
 		categoryService.update(categoryDTO);
 		return null;
@@ -80,22 +82,24 @@ public class CategoryController {
 	 * @return
 	 * @throws
 	 */
-	@RequestMapping("get/{id}")
-	public Message<?> get(@PathVariable Long id) {
-		return Message.success(categoryService.selectEntityById(id));
+	@RequestMapping("get/{cateCode}")
+	public Message<?> get(@PathVariable Long cateCode) {
+		AssertUtils.notNull(cateCode, "编码不能为空");
+		return Message.success(categoryService.selectEntityById(cateCode));
 	}
 	/**
 	 * 
 	 * @Title delect
 	 * @Description 主键删除
-	 * @param id
+	 * @param cateCode
 	 * @return
 	 * @throws
 	 */
-	@RequestMapping("delect/{id}")
-	public Message<?> delect(@PathVariable Long id) {
-		categoryService.delectById(id);
+	@RequestMapping("delect/{cateCode}")
+	public Message<?> delect(@PathVariable Long cateCode) {
+		AssertUtils.notNull(cateCode, "编码不能为空");
+		categoryService.delectById(cateCode);
 		return Message.success();
 	}
@@ -109,6 +113,7 @@ public class CategoryController {
 	 */
 	@RequestMapping("selectCategoryChild/{cateCode}")
 	public Message<?> selectCategoryChild(@PathVariable String cateCode) {
+		AssertUtils.notEmpty(cateCode, "编码不能为空");
 		List<CategoryDo> categoryDos = categoryService.selectCateChild(cateCode);
 		return Message.success(categoryDos);
 	}
@@ -125,11 +130,11 @@ public class CategoryController {
 			if (!ImageUtil.isImage(file.getInputStream())) {
 				throw new ProductException(ExceptionEnum.FILE_UP_ERROR.getCode(),"只能上传图片");
 			}
-//			if (!ImageUtil.checkImageSize(file.getInputStream(), MAX_WIDTH, MAX_HEIGHT, MIN_WIDTH, MIN_HEIGHT)) {
-//				
-//				throw new ProductException(ExceptionEnum.FILE_UP_ERROR.getCode(),"上传图片长宽超过限制，请保证图片大小范围为" + MIN_WIDTH + "*" + MIN_HEIGHT + "到" + MAX_WIDTH + "*"
-//						+ MAX_HEIGHT);
-//			}
+			if (!ImageUtil.checkImageSize(file.getInputStream(), MAX_WIDTH, MAX_HEIGHT, MIN_WIDTH, MIN_HEIGHT)) {
+				
+				throw new ProductException(ExceptionEnum.FILE_UP_ERROR.getCode(),"上传图片长宽超过限制，请保证图片大小范围为" + MIN_WIDTH + "*" + MIN_HEIGHT + "到" + MAX_WIDTH + "*"
+						+ MAX_HEIGHT);
+			}
 			if (file.getBytes().length > MAX_FILE_SIZE) {
 				throw new ProductException(ExceptionEnum.FILE_UP_ERROR.getCode(),"上传图片大小超过限制,请保证图片不超过256K");
 			}
@@ -14,6 +14,7 @@ import com.diligrp.xtrade.product.domain.dto.ShopDto;
 import com.diligrp.xtrade.product.domain.entity.ShopDo;
 import com.diligrp.xtrade.product.service.ShopService;
 import com.diligrp.xtrade.shared.domain.Message;
+import com.diligrp.xtrade.shared.util.AssertUtils;
 /**
  * @ClassName: ShopControler
@@ -53,6 +54,7 @@ public class ShopController {
 	@RequestMapping("get/{shopId}")
 	public Message<?> get(@PathVariable Long shopId){
+		AssertUtils.notNull(shopId, "店铺id不能为空");
 		return Message.success(shopService.selectByShopId(shopId));
 	}
@@ -66,6 +68,7 @@ public class ShopController {
 	 */
 	@RequestMapping("selectShopByMerId/{merId}")
 	public Message<?> selectShopByMerId(@PathVariable Long merId){
+		AssertUtils.notNull(merId, "商户id不能为空");
 		List<ShopDo> shopDos = shopService.selectShopByMerId(merId);
 		return Message.success(shopDos);