Parcourir la source

品类管理新增接口

enderx il y a 8 ans
Parent
commit
11a476a5fb

+ 2 - 2
generatorConfig.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE generatorConfiguration PUBLIC "-//mybatis.org//DTD MyBatis Generator Configuration 1.0//EN" "http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd">
 <generatorConfiguration>
-  <classPathEntry location="E:/mysql-connector-java-5.1.40.jar" />
+  <classPathEntry location="C:/Users/Administrator/.dbeaver-drivers/maven/maven-central/mysql/mysql-connector-java-5.1.44.jar" />
   <context id="context1">	
     <jdbcConnection connectionURL="jdbc:mysql://192.168.1.213:3306/aft" 
     	driverClass="com.mysql.jdbc.Driver" password="123456" userId="dev" />
     <javaModelGenerator targetPackage="com.goafanti.common.model" targetProject="AFT" />
     <sqlMapGenerator targetPackage="com.goafanti.common.mapper" targetProject="AFT" />
     <javaClientGenerator targetPackage="com.goafanti.common.dao" targetProject="AFT" type="XMLMAPPER" />
-    <table schema="aft" tableName="user_identity"/>
+    <table schema="aft" tableName="business_varieties"/>
   </context>
 </generatorConfiguration>

+ 35 - 26
src/main/java/com/goafanti/admin/bo/BusinessVarietiesBo.java

@@ -7,53 +7,60 @@ public class BusinessVarietiesBo {
 	/*分类ID*/
 	private String id;
 	/*创建人*/
-	private String create_id;
+	private String createId;
 	/*创建时间*/
-	private Date create_time;
+	private Date createTime;
 	/*更新时间*/
-	private Date update_time;
+	private Date updateTime;
 	/*删除标识*/
-	private Integer delete_sign;
+	private Integer deleteSign;
 	/*分类编号*/
 	private String cid;
 	/*分类名称*/
 	private String cname;
 	/*父分类*/
-	private String super_id;
+	private String superId;
 	/*分类层级*/
 	private Integer layer;
 	/*分类状态*/
 	private String status;
-	
+	/*上级品类*/
+	private String superName;
+	public String getSuperName() {
+		return superName;
+	}
+	public void setSuperName(String superName) {
+		this.superName = superName;
+	}
 	public String getId() {
 		return id;
 	}
 	public void setId(String id) {
 		this.id = id;
 	}
-	public String getCreate_id() {
-		return create_id;
+	public String getCreateId() {
+		return createId;
 	}
-	public void setCreate_id(String create_id) {
-		this.create_id = create_id;
+	public void setCreateId(String createId) {
+		this.createId = createId;
 	}
-	public Date getCreate_time() {
-		return create_time;
+	public Date getCreateTime() {
+		return createTime;
 	}
-	public void setCreate_time(Date create_time) {
-		this.create_time = create_time;
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
 	}
-	public Date getUpdate_time() {
-		return update_time;
+	public Date getUpdateTime() {
+		return updateTime;
 	}
-	public void setUpdate_time(Date update_time) {
-		this.update_time = update_time;
+	public void setUpdateTime(Date updateTime) {
+		this.updateTime = updateTime;
 	}
-	public Integer getDelete_sign() {
-		return delete_sign;
+	public Integer getDeleteSign() {
+		return deleteSign;
 	}
-	public void setDelete_sign(Integer delete_sign) {
-		this.delete_sign = delete_sign;
+	public void setDeleteSign(Integer deleteSign) {
+		this.deleteSign = deleteSign;
 	}
 	public String getCid() {
 		return cid;
@@ -67,11 +74,11 @@ public class BusinessVarietiesBo {
 	public void setCname(String cname) {
 		this.cname = cname;
 	}
-	public String getSuper_id() {
-		return super_id;
+	public String getSuperId() {
+		return superId;
 	}
-	public void setSuper_id(String super_id) {
-		this.super_id = super_id;
+	public void setSuperId(String superId) {
+		this.superId = superId;
 	}
 	public Integer getLayer() {
 		return layer;
@@ -85,5 +92,7 @@ public class BusinessVarietiesBo {
 	public void setStatus(String status) {
 		this.status = status;
 	}
+	
+	
 }
 

+ 30 - 3
src/main/java/com/goafanti/admin/controller/AdminVarietiesApiController.java

@@ -5,6 +5,7 @@ import javax.annotation.Resource;
 
 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;
 
 
@@ -16,7 +17,7 @@ import com.goafanti.common.model.Admin;
 import com.goafanti.common.model.BusinessVarieties;
 import com.goafanti.common.utils.StringUtils;
 @RestController
-@RequestMapping("api/admin/Varieties")
+@RequestMapping("open/api/admin/Varieties")
 public class AdminVarietiesApiController extends BaseController{
 	@Resource
 	private AdminVarietiesService adminVarietiesService;
@@ -44,7 +45,7 @@ public class AdminVarietiesApiController extends BaseController{
 	 * 搜索品类
 	 */
 	@RequestMapping(value="/vtList" ,method=RequestMethod.GET)
-	public Result vtList(String cname,String super_name,Integer layer,
+	public Result vtList(String cname,String super_id,Integer layer,
 			String status,String pageNo, String pageSize) {
 		Result res = new Result();
         Integer pNo = 1;
@@ -55,8 +56,34 @@ public class AdminVarietiesApiController extends BaseController{
         if (StringUtils.isNumeric(pageNo)) {
             pNo = Integer.parseInt(pageNo);
         }
-        res.setData(adminVarietiesService);
+        res.setData(adminVarietiesService.listVarieties(cname, super_id, layer,
+        		status, pNo, pSize));
 		return res;
 	}
+	/**
+	 * 获取父类信息
+	 * 
+	 */
+	@RequestMapping(value = "/getSuperList" , method = RequestMethod.GET)
+	public Result getSuperList() {
+		Result res=new Result();
+		res.setData(adminVarietiesService.getSuperList());
+		return res;
+		
+	}
+	/**
+	 * 编辑品类
+	 */
+	@RequestMapping(value="/detailVarieties" ,method=RequestMethod.GET)
+	public Result detailVarieties(String  id) {
+		Result res = new Result();
+		res.setData(adminVarietiesService.editVarieties(id));
+		return res;
+	}
+	/*@SuppressWarnings("unchecked")
+	@RequestMapping(value = "/editVarieties", method = RequestMethod.POST)
+	public Result editVarieties (@RequestParam(value = "roles[]", required = false) String[] roleIds,String data) {
+		
+	}*/
 
 }

+ 9 - 1
src/main/java/com/goafanti/admin/service/AdminVarietiesService.java

@@ -1,10 +1,18 @@
 package com.goafanti.admin.service;
 
+import java.util.List;
+
+import com.goafanti.admin.bo.BusinessVarietiesBo;
 import com.goafanti.core.mybatis.page.Pagination;
 
 public interface AdminVarietiesService {
 	
 	int insert(String cname, String superId);
 	
-	/*Pagination<BusinessVaruetiesBo> bvList();*/
+	Pagination<BusinessVarietiesBo> listVarieties(String cname, String super_id, Integer layer, String status,
+			Integer pNo, Integer pSize);
+	
+	List<BusinessVarietiesBo> getSuperList();
+	
+	BusinessVarietiesBo editVarieties(String id);
 }

+ 76 - 14
src/main/java/com/goafanti/admin/service/impl/AdminVarietiesServiceImpl.java

@@ -1,5 +1,8 @@
 package com.goafanti.admin.service.impl;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.UUID;
 
 import org.springframework.beans.BeanUtils;
@@ -9,38 +12,97 @@ import org.springframework.stereotype.Service;
 import com.goafanti.admin.bo.BusinessVarietiesBo;
 import com.goafanti.admin.service.AdminVarietiesService;
 import com.goafanti.common.dao.AdminVarietiesMapper;
+import com.goafanti.common.dao.BusinessVarietiesMapper;
 import com.goafanti.common.model.BusinessVarieties;
+import com.goafanti.common.utils.StringUtils;
+import com.goafanti.core.mybatis.BaseMybatisDao;
+import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
 
 @Service
-public class AdminVarietiesServiceImpl implements AdminVarietiesService {
+public class AdminVarietiesServiceImpl extends BaseMybatisDao<BusinessVarietiesMapper> implements AdminVarietiesService {
 	
 	@Autowired
-	private AdminVarietiesMapper adminVarietiesMapper;
+	private BusinessVarietiesMapper businessVarietiesMapper;
 	
 	public int insert(String cname, String superId) {
 		BusinessVarietiesBo buv=new BusinessVarietiesBo();
 		buv.setId(UUID.randomUUID().toString());
 		buv.setCname(cname);
-		buv.setSuper_id(superId);
-		buv.setDelete_sign(0);
-		if (Integer.valueOf(superId)<=0) {
-			if (null!=adminVarietiesMapper.MaxId(superId)||adminVarietiesMapper.MaxId(superId)>0) {
-				buv.setCid("00"+adminVarietiesMapper.MaxId(superId));
+		buv.setSuperId(superId);
+		buv.setDeleteSign(0);
+		String str=businessVarietiesMapper.getCid(superId);
+		int i=Integer.valueOf(businessVarietiesMapper.getCount(superId));
+		if (3>=str.length()) {
+			 if(Integer.valueOf(i)<10){
+				buv.setCid("BZ0"+i);
+			}else {
+				buv.setCid("BZ"+i);
 			}
 		}else {
-			if (null!=adminVarietiesMapper.MaxId(superId)||adminVarietiesMapper.MaxId(superId)>0) {
-				buv.setCid(superId+adminVarietiesMapper.MaxId(superId));
+			int w=i+1;
+			if(Integer.valueOf(i)<10){
+				buv.setCid(str+"0"+w);
+			}else {
+				buv.setCid(str+w);
 			}
-			
 		}
-		buv.setCreate_id(TokenManager.getAdminId());
-		buv.setLayer(buv.getCid().length()/2);
-		buv.setStatus("正常");
+		buv.setLayer(str.length()/2-1);
+		buv.setCreateId("f31c0d1a-05bc-4f5c-b4a8-95f983d24131");//测试
+		if (StringUtils.isNotBlank(TokenManager.getAdminId())) {
+			buv.setCreateId(TokenManager.getAdminId());
+		}
+		
+		
+		buv.setStatus("0");
 		BusinessVarieties bv=new BusinessVarieties();
 		BeanUtils.copyProperties(buv,bv);
-		return adminVarietiesMapper.insert(bv);
+		return businessVarietiesMapper.insert(bv);
 		
 	}
+	@SuppressWarnings("unchecked")
+	@Override
+	public Pagination<BusinessVarietiesBo> listVarieties(String cname, String super_id, Integer layer, String status,
+			Integer pNo, Integer pSize) {
+		if (pNo == null || pNo < 0) {
+			pNo = 1;
+		}
+
+		if (pSize == null || pSize < 0 || pSize > 10) {
+			pSize = 10;
+		} 
+		return (Pagination<BusinessVarietiesBo>) findPage("findVarietiesListByPage", "findVarietiesListCount",
+				disposeParams(cname,super_id,layer,status),pNo,pSize);
+	}
+
+	private Map<String, Object> disposeParams(String cname, String super_name, Integer layer, String status) {
+		Map<String, Object> params = new HashMap<>();
+
+		if (null != cname) {
+			params.put("cname", cname);
+		}
+
+		if (null != super_name) {
+			params.put("super_name", super_name);
+		}
 
+		if (null != layer) {
+			params.put("layer", layer);
+		}
+		if (null != status) {
+			params.put("status", status);
+		}
+
+		
+		return params;
+	}
+	public List<BusinessVarietiesBo> getSuperList() {
+		
+		return businessVarietiesMapper.getSuperList();
+	}
+	@Override
+	public BusinessVarietiesBo editVarieties(String id) {
+		
+		return businessVarietiesMapper.editVarieties(id);
+	}
 }

+ 4 - 1
src/main/java/com/goafanti/common/dao/AdminVarietiesMapper.java

@@ -1,12 +1,15 @@
 package com.goafanti.common.dao;
 
+import java.util.List;
+
+import com.goafanti.admin.bo.BusinessVarietiesBo;
 import com.goafanti.common.model.BusinessVarieties;
 
 public interface AdminVarietiesMapper {
    
 	Integer insert(BusinessVarieties bv);
 
-	Integer MaxId(String superId);
+	
 
    
 

+ 0 - 30
src/main/java/com/goafanti/common/mapper/AdminVarietiesMapper.xml

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.goafanti.common.dao.AdminVarietiesMapper">
-  <sql id="varietiesList" >
-    id,create_id,create_time,update_time,
-    ,delete_sign,cid,cname,super_id,layer,status
-  </sql>
-  
-  
-   <insert id="insert" parameterType="com.goafanti.admin.bo.BusinessVarietiesBo">
-    insert into business_varieties (
-    <include refid="varietiesList"/>
-    )values
-    (#{id,jdbcType=VARCHAR},#{create_id,jdbcType=VARCHAR},now(),#{update_time,jdbcType=TIMESTAMP},
-    #{delete_sign,jdbcType=INTEGER},#{cid,jdbcType=VARCHAR},
-    #{cname,jdbcType=VARCHAR},#{super_id,jdbcType=VARCHAR},#{layer,jdbcType=INTEGER},#{status,jdbcType=VARCHAR})
-    </insert>
-    
-    <select id="selectvarieties" resultType="com.goafanti.admin.bo.BusinessVarietiesBo" >
-    select 
-    <include refid="varietiesList" />
-    from business_varieties
-    
-  	</select>
-  	
-  	<select id="MaxId" resultType="string">
-  	select max(cid) from business_varieties
-  	where super_id=#{superId,jdbcType=VARCHAR} 
-  	</select>
-</mapper>

+ 177 - 46
src/main/java/com/goafanti/common/model/BusinessVarieties.java

@@ -3,86 +3,217 @@ package com.goafanti.common.model;
 import java.util.Date;
 
 public class BusinessVarieties {
-	/*分类ID*/
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_varieties.id
+	 * @mbg.generated  Thu Nov 30 10:03:07 CST 2017
+	 */
 	private String id;
-	/*创建人*/
-	private String create_id;
-	/*创建时间*/
-	private Date create_time;
-	/*更新时间*/
-	private Date update_time;
-	/*删除标识*/
-	private Integer delete_sign;
-	/*分类编号*/
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_varieties.create_id
+	 * @mbg.generated  Thu Nov 30 10:03:07 CST 2017
+	 */
+	private String createId;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_varieties.create_time
+	 * @mbg.generated  Thu Nov 30 10:03:07 CST 2017
+	 */
+	private Date createTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_varieties.update_time
+	 * @mbg.generated  Thu Nov 30 10:03:07 CST 2017
+	 */
+	private Date updateTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_varieties.delete_sign
+	 * @mbg.generated  Thu Nov 30 10:03:07 CST 2017
+	 */
+	private Integer deleteSign;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_varieties.cid
+	 * @mbg.generated  Thu Nov 30 10:03:07 CST 2017
+	 */
 	private String cid;
-	/*分类名称*/
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_varieties.cname
+	 * @mbg.generated  Thu Nov 30 10:03:07 CST 2017
+	 */
 	private String cname;
-	/*父分类*/
-	private String super_id;
-	/*分类层级*/
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_varieties.super_id
+	 * @mbg.generated  Thu Nov 30 10:03:07 CST 2017
+	 */
+	private String superId;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_varieties.layer
+	 * @mbg.generated  Thu Nov 30 10:03:07 CST 2017
+	 */
 	private Integer layer;
-	/*分类状态*/
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_varieties.status
+	 * @mbg.generated  Thu Nov 30 10:03:07 CST 2017
+	 */
 	private String status;
-	
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_varieties.id
+	 * @return  the value of business_varieties.id
+	 * @mbg.generated  Thu Nov 30 10:03:07 CST 2017
+	 */
 	public String getId() {
 		return id;
 	}
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_varieties.id
+	 * @param id  the value for business_varieties.id
+	 * @mbg.generated  Thu Nov 30 10:03:07 CST 2017
+	 */
 	public void setId(String id) {
 		this.id = id;
 	}
-	public String getCreate_id() {
-		return create_id;
-	}
-	public void setCreate_id(String create_id) {
-		this.create_id = create_id;
-	}
-	public Date getCreate_time() {
-		return create_time;
-	}
-	public void setCreate_time(Date create_time) {
-		this.create_time = create_time;
-	}
-	public Date getUpdate_time() {
-		return update_time;
-	}
-	public void setUpdate_time(Date update_time) {
-		this.update_time = update_time;
-	}
-	public Integer getDelete_sign() {
-		return delete_sign;
-	}
-	public void setDelete_sign(Integer delete_sign) {
-		this.delete_sign = delete_sign;
-	}
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_varieties.create_id
+	 * @return  the value of business_varieties.create_id
+	 * @mbg.generated  Thu Nov 30 10:03:07 CST 2017
+	 */
+	public String getCreateId() {
+		return createId;
+	}
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_varieties.create_id
+	 * @param createId  the value for business_varieties.create_id
+	 * @mbg.generated  Thu Nov 30 10:03:07 CST 2017
+	 */
+	public void setCreateId(String createId) {
+		this.createId = createId;
+	}
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_varieties.create_time
+	 * @return  the value of business_varieties.create_time
+	 * @mbg.generated  Thu Nov 30 10:03:07 CST 2017
+	 */
+	public Date getCreateTime() {
+		return createTime;
+	}
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_varieties.create_time
+	 * @param createTime  the value for business_varieties.create_time
+	 * @mbg.generated  Thu Nov 30 10:03:07 CST 2017
+	 */
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_varieties.update_time
+	 * @return  the value of business_varieties.update_time
+	 * @mbg.generated  Thu Nov 30 10:03:07 CST 2017
+	 */
+	public Date getUpdateTime() {
+		return updateTime;
+	}
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_varieties.update_time
+	 * @param updateTime  the value for business_varieties.update_time
+	 * @mbg.generated  Thu Nov 30 10:03:07 CST 2017
+	 */
+	public void setUpdateTime(Date updateTime) {
+		this.updateTime = updateTime;
+	}
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_varieties.delete_sign
+	 * @return  the value of business_varieties.delete_sign
+	 * @mbg.generated  Thu Nov 30 10:03:07 CST 2017
+	 */
+	public Integer getDeleteSign() {
+		return deleteSign;
+	}
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_varieties.delete_sign
+	 * @param deleteSign  the value for business_varieties.delete_sign
+	 * @mbg.generated  Thu Nov 30 10:03:07 CST 2017
+	 */
+	public void setDeleteSign(Integer deleteSign) {
+		this.deleteSign = deleteSign;
+	}
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_varieties.cid
+	 * @return  the value of business_varieties.cid
+	 * @mbg.generated  Thu Nov 30 10:03:07 CST 2017
+	 */
 	public String getCid() {
 		return cid;
 	}
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_varieties.cid
+	 * @param cid  the value for business_varieties.cid
+	 * @mbg.generated  Thu Nov 30 10:03:07 CST 2017
+	 */
 	public void setCid(String cid) {
 		this.cid = cid;
 	}
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_varieties.cname
+	 * @return  the value of business_varieties.cname
+	 * @mbg.generated  Thu Nov 30 10:03:07 CST 2017
+	 */
 	public String getCname() {
 		return cname;
 	}
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_varieties.cname
+	 * @param cname  the value for business_varieties.cname
+	 * @mbg.generated  Thu Nov 30 10:03:07 CST 2017
+	 */
 	public void setCname(String cname) {
 		this.cname = cname;
 	}
-	public String getSuper_id() {
-		return super_id;
-	}
-	public void setSuper_id(String super_id) {
-		this.super_id = super_id;
-	}
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_varieties.super_id
+	 * @return  the value of business_varieties.super_id
+	 * @mbg.generated  Thu Nov 30 10:03:07 CST 2017
+	 */
+	public String getSuperId() {
+		return superId;
+	}
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_varieties.super_id
+	 * @param superId  the value for business_varieties.super_id
+	 * @mbg.generated  Thu Nov 30 10:03:07 CST 2017
+	 */
+	public void setSuperId(String superId) {
+		this.superId = superId;
+	}
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_varieties.layer
+	 * @return  the value of business_varieties.layer
+	 * @mbg.generated  Thu Nov 30 10:03:07 CST 2017
+	 */
 	public Integer getLayer() {
 		return layer;
 	}
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_varieties.layer
+	 * @param layer  the value for business_varieties.layer
+	 * @mbg.generated  Thu Nov 30 10:03:07 CST 2017
+	 */
 	public void setLayer(Integer layer) {
 		this.layer = layer;
 	}
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_varieties.status
+	 * @return  the value of business_varieties.status
+	 * @mbg.generated  Thu Nov 30 10:03:07 CST 2017
+	 */
 	public String getStatus() {
 		return status;
 	}
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_varieties.status
+	 * @param status  the value for business_varieties.status
+	 * @mbg.generated  Thu Nov 30 10:03:07 CST 2017
+	 */
 	public void setStatus(String status) {
 		this.status = status;
 	}
+	
 }