category 字段优化

yangfan
1 parent 7ca0016e
Showing 8 changed files with 66 additions and 36 deletions
src/main/java/com/diligrp/xtrade/product/controllor/CategoryController.java
src/main/java/com/diligrp/xtrade/product/dao/CategoryDao.java
src/main/java/com/diligrp/xtrade/product/domain/dto/CategoryDto.java
src/main/java/com/diligrp/xtrade/product/domain/dto/ShopQueryDto.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/service/impl/CategoryServiceImpl.java
src/main/resources/mapping/com/diligrp/xtrade/product/CategoryDao.xml
@@ -51,13 +51,8 @@ public class CategoryController {
 	 * @throws
 	 */
 	@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);
-		}
+	public Message<?> save(CategoryDto categoryDTO) {
+		checkImageFile(categoryDTO.getImage());		
 		categoryService.insert(categoryDTO);
 		return Message.success();
 	}
@@ -128,15 +123,15 @@ public class CategoryController {
 	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);
+				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 (file.getBytes().length > MAX_FILE_SIZE) {
-				new ProductException(200005,"上传图片大小超过限制,请保证图片不超过256K");
+				throw new ProductException(ExceptionEnum.FILE_UP_ERROR.getCode(),"上传图片大小超过限制,请保证图片不超过256K");
 			}
 		} catch (IOException e) {
 			throw new ProductException(ExceptionEnum.FILE_UP_ERROR);
@@ -29,11 +29,11 @@ public interface CategoryDao {
 	 * 
 	 * @Title selectList
 	 * @Description 品类条件查询
-	 * @param categoryQueryDto
+	 * @param category
 	 * @return
 	 * @throws
 	 */
-	List<CategoryDo> selectList(CategoryQueryDto categoryQueryDto);
+	List<CategoryDo> selectList(CategoryDo category);
 	/**
 	 * 
 	 * @Title selectCateChild
 package com.diligrp.xtrade.product.domain.dto;
+import javax.validation.constraints.NotBlank;
+
+import org.springframework.web.multipart.MultipartFile;
 /**
  * @ClassName: CategoryDto
@@ -17,10 +20,12 @@ public class CategoryDto{
 	/**
 	 * 品类名称
 	 */
+	@NotBlank(message = "品类名称不能为空")
 	private String cname;
 	/**
 	 * 拼音缩写
 	 */
+	@NotBlank(message = "品类拼音简写不能为空")
 	private String shortName;
 	/**
 	 * 品类状态
@@ -37,7 +42,7 @@ public class CategoryDto{
 	/**
 	 * 图片
 	 */
-	private byte[] image;
+	private MultipartFile image;
 	/**
 	 * 品类有效期
 	 */
@@ -45,7 +50,7 @@ public class CategoryDto{
 	/**
 	 * 类型
 	 */
-	private Long type;
+	private Integer type;
 	/**
 	 * 品类等级
 	 */
@@ -53,6 +58,7 @@ public class CategoryDto{
 	/**
 	 * 市场id
 	 */
+	@NotBlank(message = "市场id不能为空")
 	private Integer marketId;
 	public String getParentId() {
 		return parentId;
@@ -97,10 +103,10 @@ public class CategoryDto{
 		this.icon = icon;
 	}
-	public byte[] getImage() {
+	public MultipartFile getImage() {
 		return image;
 	}
-	public void setImage(byte[] image) {
+	public void setImage(MultipartFile image) {
 		this.image = image;
 	}
 	public Integer getValidDay() {
@@ -109,10 +115,11 @@ public class CategoryDto{
 	public void setValidDay(Integer validDay) {
 		this.validDay = validDay;
 	}
-	public Long getType() {
+	
+	public Integer getType() {
 		return type;
 	}
-	public void setType(Long type) {
+	public void setType(Integer type) {
 		this.type = type;
 	}
 	public Integer getLevel() {
@@ -13,6 +13,7 @@ public class ShopQueryDto {
 	private String shopName;
 	private Long merId;
 	private LocalDateTime createdTime;
+	private String address;
 	public String getShopName() {
 		return shopName;
 	}
@@ -31,5 +32,11 @@ public class ShopQueryDto {
 	public void setCreatedTime(LocalDateTime createdTime) {
 		this.createdTime = createdTime;
 	}
+	public String getAddress() {
+		return address;
+	}
+	public void setAddress(String address) {
+		this.address = address;
+	}
 }
@@ -44,7 +44,7 @@ public class CategoryDo extends BaseDo{
 	/**
 	 * 类型
 	 */
-	private Long type;
+	private Integer type;
 	/**
 	 * 品类等级
 	 */
@@ -103,10 +103,11 @@ public class CategoryDo extends BaseDo{
 	public void setValidDay(Integer validDay) {
 		this.validDay = validDay;
 	}
-	public Long getType() {
+	
+	public Integer getType() {
 		return type;
 	}
-	public void setType(Long type) {
+	public void setType(Integer type) {
 		this.type = type;
 	}
 	public Integer getLevel() {
@@ -16,7 +16,6 @@ public enum ExceptionEnum implements IEnumType {
 	CARD_MERCHANT_CREATED(200003,"该卡已创建商户，请使用用户名密码登录"),
 	CATE_EXISTENCE(200004,"品类已存在"),
 	FILE_UP_ERROR(200005,"文件上传失败"),
-	NOT_IMAGE(200006,"只能上传图片")
 	;
 	private int code;
 package com.diligrp.xtrade.product.service.impl;
+import java.io.IOException;
 import java.util.List;
 import org.apache.commons.lang3.StringUtils;
@@ -50,7 +51,14 @@ 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);
+		try {
+			categoryDo.setImage(category.getImage().getBytes());
+		} catch (IOException e) {
+			throw new ProductException(ExceptionEnum.FILE_UP_ERROR);
+		}
+		categoryDo.setIcon(ICON_PREFIX + ImageUtil.getMd5(categoryDo.getImage()) + id);
+		categoryDo.setStatus(1);
+		categoryDo.setId(id);
 		categoryDao.insert(categoryDo);
 	} 
@@ -77,7 +85,9 @@ public class CategoryServiceImpl implements CategoryService {
 	@Override
 	public List<CategoryDo> selectList(CategoryQueryDto categoryQueryDto) {
-		return categoryDao.selectList(categoryQueryDto);
+		CategoryDo categoryDo = new CategoryDo();
+		BeanUtils.copyProperties(categoryQueryDto, categoryDo);
+		return categoryDao.selectList(categoryDo);
 	}
 	@Override
@@ -94,11 +104,11 @@ public class CategoryServiceImpl implements CategoryService {
 	 * @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);
+		CategoryDo categoryDo = new CategoryDo();
+		categoryDo.setCname(category.getCname());
+		categoryDo.setLevel(category.getLevel());
+		categoryDo.setMarketId(category.getMarketId());
+		List<CategoryDo> categorys = categoryDao.selectList(categoryDo);
 		if(categorys != null && categorys.size() > 0) {
 			return true;
 		}
@@ -15,7 +15,7 @@
 			<if test="hasChild != null"><![CDATA[has_child = #{hasChild},]]></if>
 			<if test="shortName != null"><![CDATA[short_name = #{shortName},]]></if>
 			<if test="icon != null"><![CDATA[icon = #{icon},]]></if>
-			<if test="cateLevel != null"><![CDATA[cate_level = #{cateLevel},]]></if>
+			<if test="level != null"><![CDATA[level = #{level},]]></if>
 			<if test="image != null"><![CDATA[image = #{image},]]></if>
 			<if test="validDay != null"><![CDATA[valid_day = #{validDay},]]></if>
 		</set>
@@ -24,15 +24,16 @@
 		<where>
 			<if test="cname != null and cname != ''"><![CDATA[AND cname = #{cname}]]></if>
 			<if test="status != null and status != ''"><![CDATA[AND status = #{status}]]></if>
-			<if test="cateLevel != null "><![CDATA[AND cate_level = #{cateLevel}]]></if>
+			<if test="level != null "><![CDATA[AND level = #{level}]]></if>
 			<if test="shortName != null and shortName != ''"><![CDATA[AND short_name = #{shortName}]]></if>
 			<if test="cateCode != null and cateCode != ''"><![CDATA[AND cate_code = #{cateCode}]]></if>
+			<if test="marketId != null and marketId != ''"><![CDATA[AND market_id = #{marketId}]]></if>
 		</where>
 	</sql>
 	<insert id="insert" parameterType="com.diligrp.xtrade.product.domain.entity.CategoryDo">
 		<![CDATA[
 			INSERT INTO `category`(`id`, `cate_code`, `cname`, `short_name`, `status`, `level`, `type`, `icon`, `image`, `valid_day`, `created_time`, `modified_time`, `market_id`) VALUES
-			 (#{id}, #{cate_code}, #{sname}, #{shortName}, #{status}, #{level}, #{type}, #{icon}, #{image}, #{validDay}, now(), now(), #{marketId});
+			 (#{id}, #{cateCode}, #{cname}, #{shortName}, #{status}, #{level}, #{type}, #{icon}, #{image}, #{validDay}, now(), now(), #{marketId});
 		]]>
 	</insert>
 	<select id="selectEntityById" parameterType="java.lang.Long" resultType="com.diligrp.xtrade.product.domain.entity.CategoryDo">
@@ -68,4 +69,14 @@
 			 FROM `category` WHERE cate_code LIKE CONCAT(#{cateCode},'%');
 		]]>
 	</select>
+	<select id="selectList" resultType="com.diligrp.xtrade.product.domain.entity.CategoryDo"  parameterType="com.diligrp.xtrade.product.domain.entity.CategoryDo" >
+		<![CDATA[
+			SELECT
+		]]>
+			<include refid="QUERY_COLUMN_LIST"/>
+		<![CDATA[
+			 FROM `category` 
+		]]>
+			<include refid="QUERY_WHERE_CLAUSE"/>
+	</select>
 </mapper>