修改商品类别展示方式为树形结构
This commit is contained in:
@@ -70,6 +70,19 @@ public class BusinessConstants {
|
||||
public static final String SEQ_TO_STRING_LESS_INSERT = "0";
|
||||
//单据编号
|
||||
public static final String DEPOT_NUMBER_SEQ = "depot_number_seq";
|
||||
/**
|
||||
* 商品类别根目录id
|
||||
* */
|
||||
public static final Long MATERIAL_CATEGORY_ROOT_ID = 1L;
|
||||
/**
|
||||
* 商品类别状态
|
||||
* 0系统默认,1启用,2删除
|
||||
* */
|
||||
public static final String MATERIAL_CATEGORY_STATUS_DEFAULT = "0";
|
||||
public static final String MATERIAL_CATEGORY_STATUS_ENABLE = "1";
|
||||
public static final String MATERIAL_CATEGORY_STATUS_DELETE = "2";
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -59,6 +59,19 @@ public class ExceptionConstants {
|
||||
//商品库存不足
|
||||
public static final int MATERIAL_STOCK_NOT_ENOUGH_CODE = 8000004;
|
||||
public static final String MATERIAL_STOCK_NOT_ENOUGH_MSG = "商品:%s库存不足";
|
||||
/**
|
||||
* 商品类别信息
|
||||
* type = 75
|
||||
* */
|
||||
//添加商品类别信息失败
|
||||
public static final int MATERIAL_CATEGORY_ADD_FAILED_CODE = 7500000;
|
||||
public static final String MATERIAL_CATEGORY_ADD_FAILED_MSG = "添加商品类别信息失败";
|
||||
//删除商品类别信息失败
|
||||
public static final int MATERIAL_CATEGORY_DELETE_FAILED_CODE = 7500001;
|
||||
public static final String MATERIAL_CATEGORY_DELETE_FAILED_MSG = "删除商品类别信息失败";
|
||||
//修改商品类别信息失败
|
||||
public static final int MATERIAL_CATEGORY_EDIT_FAILED_CODE = 7500002;
|
||||
public static final String MATERIAL_CATEGORY_EDIT_FAILED_MSG = "添加商品类别信息失败";
|
||||
|
||||
/**
|
||||
* 标准正常返回/操作成功返回
|
||||
|
||||
@@ -1,69 +1,163 @@
|
||||
package com.jsh.erp.controller;
|
||||
|
||||
import com.alibaba.fastjson.JSONArray;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.jsh.erp.datasource.entities.MaterialCategory;
|
||||
import com.jsh.erp.service.materialCategory.MaterialCategoryService;
|
||||
import com.jsh.erp.utils.BaseResponseInfo;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author ji—sheng—hua 华夏ERP
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping(value = "/materialCategory")
|
||||
public class MaterialCategoryController {
|
||||
private Logger logger = LoggerFactory.getLogger(MaterialCategoryController.class);
|
||||
|
||||
@Resource
|
||||
private MaterialCategoryService materialCategoryService;
|
||||
|
||||
@GetMapping(value = "/getAllList")
|
||||
public BaseResponseInfo getAllList(@RequestParam("parentId") Long parentId, HttpServletRequest request) {
|
||||
BaseResponseInfo res = new BaseResponseInfo();
|
||||
try {
|
||||
List<MaterialCategory> materialCategoryList = materialCategoryService.getAllList(parentId);
|
||||
res.code = 200;
|
||||
res.data = materialCategoryList;
|
||||
} catch(Exception e){
|
||||
e.printStackTrace();
|
||||
res.code = 500;
|
||||
res.data = "获取数据失败";
|
||||
}
|
||||
return res;
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据id来查询商品名称
|
||||
* @param id
|
||||
* @param request
|
||||
* @return
|
||||
*/
|
||||
@GetMapping(value = "/findById")
|
||||
public BaseResponseInfo findById(@RequestParam("id") Long id, HttpServletRequest request) {
|
||||
BaseResponseInfo res = new BaseResponseInfo();
|
||||
try {
|
||||
List<MaterialCategory> dataList = materialCategoryService.findById(id);
|
||||
JSONObject outer = new JSONObject();
|
||||
if (null != dataList) {
|
||||
for (MaterialCategory mc : dataList) {
|
||||
outer.put("name", mc.getName());
|
||||
outer.put("parentId", mc.getParentid());
|
||||
}
|
||||
}
|
||||
res.code = 200;
|
||||
res.data = outer;
|
||||
} catch(Exception e){
|
||||
e.printStackTrace();
|
||||
res.code = 500;
|
||||
res.data = "获取数据失败";
|
||||
}
|
||||
return res;
|
||||
}
|
||||
}
|
||||
package com.jsh.erp.controller;
|
||||
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import com.alibaba.fastjson.JSONArray;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.google.gson.JsonObject;
|
||||
import com.jsh.erp.constants.ExceptionConstants;
|
||||
import com.jsh.erp.datasource.entities.MaterialCategory;
|
||||
import com.jsh.erp.datasource.entities.SerialNumberEx;
|
||||
import com.jsh.erp.datasource.vo.TreeNode;
|
||||
import com.jsh.erp.exception.BusinessRunTimeException;
|
||||
import com.jsh.erp.service.materialCategory.MaterialCategoryService;
|
||||
import com.jsh.erp.utils.BaseResponseInfo;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author ji—sheng—hua 华夏ERP
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping(value = "/materialCategory")
|
||||
public class MaterialCategoryController {
|
||||
private Logger logger = LoggerFactory.getLogger(MaterialCategoryController.class);
|
||||
|
||||
@Resource
|
||||
private MaterialCategoryService materialCategoryService;
|
||||
|
||||
@GetMapping(value = "/getAllList")
|
||||
public BaseResponseInfo getAllList(@RequestParam("parentId") Long parentId, HttpServletRequest request) {
|
||||
BaseResponseInfo res = new BaseResponseInfo();
|
||||
try {
|
||||
List<MaterialCategory> materialCategoryList = materialCategoryService.getAllList(parentId);
|
||||
res.code = 200;
|
||||
res.data = materialCategoryList;
|
||||
} catch(Exception e){
|
||||
e.printStackTrace();
|
||||
res.code = 500;
|
||||
res.data = "获取数据失败";
|
||||
}
|
||||
return res;
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据id来查询商品名称
|
||||
* @param id
|
||||
* @param request
|
||||
* @return
|
||||
*/
|
||||
@RequestMapping(value = "/findById")
|
||||
public BaseResponseInfo findById(@RequestParam("id") Long id, HttpServletRequest request) {
|
||||
BaseResponseInfo res = new BaseResponseInfo();
|
||||
try {
|
||||
List<MaterialCategory> dataList = materialCategoryService.findById(id);
|
||||
JSONObject outer = new JSONObject();
|
||||
if (null != dataList) {
|
||||
for (MaterialCategory mc : dataList) {
|
||||
outer.put("id", mc.getId());
|
||||
outer.put("name", mc.getName());
|
||||
outer.put("parentId", mc.getParentid());
|
||||
List<MaterialCategory> dataParentList = materialCategoryService.findById(mc.getParentid());
|
||||
if(dataParentList!=null&&dataParentList.size()>0){
|
||||
outer.put("parentName", dataParentList.get(0).getName());
|
||||
}
|
||||
outer.put("sort", mc.getSort());
|
||||
outer.put("serialNo", mc.getSerialNo());
|
||||
outer.put("remark", mc.getRemark());
|
||||
}
|
||||
}
|
||||
res.code = 200;
|
||||
res.data = outer;
|
||||
} catch(Exception e){
|
||||
e.printStackTrace();
|
||||
res.code = 500;
|
||||
res.data = "获取数据失败";
|
||||
}
|
||||
return res;
|
||||
}
|
||||
/**
|
||||
* create by: cjl
|
||||
* description:
|
||||
* 获取商品类别树数据
|
||||
* create time: 2019/2/19 11:49
|
||||
* @Param:
|
||||
* @return com.alibaba.fastjson.JSONArray
|
||||
*/
|
||||
@RequestMapping(value = "/getMaterialCategoryTree")
|
||||
public JSONArray getMaterialCategoryTree() throws Exception{
|
||||
JSONArray arr=new JSONArray();
|
||||
List<TreeNode> materialCategoryTree = materialCategoryService.getMaterialCategoryTree();
|
||||
if(materialCategoryTree!=null&&materialCategoryTree.size()>0){
|
||||
for(TreeNode node:materialCategoryTree){
|
||||
String str=JSON.toJSONString(node);
|
||||
JSONObject obj=JSON.parseObject(str);
|
||||
arr.add(obj) ;
|
||||
}
|
||||
}
|
||||
return arr;
|
||||
}
|
||||
/**
|
||||
* create by: cjl
|
||||
* description:
|
||||
* 新增商品类别数据
|
||||
* create time: 2019/2/19 17:17
|
||||
* @Param: beanJson
|
||||
* @return java.lang.Object
|
||||
*/
|
||||
@RequestMapping(value = "/addMaterialCategory")
|
||||
public Object addMaterialCategory(@RequestParam("info") String beanJson) throws Exception {
|
||||
JSONObject result = ExceptionConstants.standardSuccess();
|
||||
MaterialCategory mc= JSON.parseObject(beanJson, MaterialCategory.class);
|
||||
int i= materialCategoryService.addMaterialCategory(mc);
|
||||
if(i<1){
|
||||
throw new BusinessRunTimeException(ExceptionConstants.MATERIAL_CATEGORY_ADD_FAILED_CODE,
|
||||
ExceptionConstants.MATERIAL_CATEGORY_ADD_FAILED_MSG);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
/**
|
||||
* create by: cjl
|
||||
* description:
|
||||
* 修改商品类别数据
|
||||
* create time: 2019/2/20 9:30
|
||||
* @Param: beanJson
|
||||
* @return java.lang.Object
|
||||
*/
|
||||
@RequestMapping(value = "/editMaterialCategory")
|
||||
public Object editMaterialCategory(@RequestParam("info") String beanJson) throws Exception {
|
||||
JSONObject result = ExceptionConstants.standardSuccess();
|
||||
MaterialCategory mc= JSON.parseObject(beanJson, MaterialCategory.class);
|
||||
int i= materialCategoryService.editMaterialCategory(mc);
|
||||
if(i<1){
|
||||
throw new BusinessRunTimeException(ExceptionConstants.MATERIAL_CATEGORY_ADD_FAILED_CODE,
|
||||
ExceptionConstants.MATERIAL_CATEGORY_ADD_FAILED_MSG);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
/**
|
||||
* create by: cjl
|
||||
* description:
|
||||
* 批量删除商品类别信息
|
||||
* create time: 2019/2/19 17:26
|
||||
* @Param: ids
|
||||
* @return java.lang.Object
|
||||
*/
|
||||
@RequestMapping(value = "/batchDeleteMaterialCategory")
|
||||
public Object batchDeleteMaterialCategory(@RequestParam("ids") String ids) throws Exception {
|
||||
JSONObject result = ExceptionConstants.standardSuccess();
|
||||
int i= materialCategoryService.batchDeleteMaterialCategoryByIds(ids);
|
||||
if(i<1){
|
||||
throw new BusinessRunTimeException(ExceptionConstants.MATERIAL_CATEGORY_DELETE_FAILED_CODE,
|
||||
ExceptionConstants.MATERIAL_CATEGORY_DELETE_FAILED_MSG);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,131 +1,389 @@
|
||||
package com.jsh.erp.datasource.entities;
|
||||
|
||||
public class MaterialCategory {
|
||||
/**
|
||||
* This field was generated by MyBatis Generator.
|
||||
* This field corresponds to the database column jsh_materialcategory.Id
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* This field was generated by MyBatis Generator.
|
||||
* This field corresponds to the database column jsh_materialcategory.Name
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
private String name;
|
||||
|
||||
/**
|
||||
* This field was generated by MyBatis Generator.
|
||||
* This field corresponds to the database column jsh_materialcategory.CategoryLevel
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
private Short categorylevel;
|
||||
|
||||
/**
|
||||
* This field was generated by MyBatis Generator.
|
||||
* This field corresponds to the database column jsh_materialcategory.ParentId
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
private Long parentid;
|
||||
|
||||
/**
|
||||
* This method was generated by MyBatis Generator.
|
||||
* This method returns the value of the database column jsh_materialcategory.Id
|
||||
*
|
||||
* @return the value of jsh_materialcategory.Id
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
public Long getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
/**
|
||||
* This method was generated by MyBatis Generator.
|
||||
* This method sets the value of the database column jsh_materialcategory.Id
|
||||
*
|
||||
* @param id the value for jsh_materialcategory.Id
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
public void setId(Long id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
/**
|
||||
* This method was generated by MyBatis Generator.
|
||||
* This method returns the value of the database column jsh_materialcategory.Name
|
||||
*
|
||||
* @return the value of jsh_materialcategory.Name
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
/**
|
||||
* This method was generated by MyBatis Generator.
|
||||
* This method sets the value of the database column jsh_materialcategory.Name
|
||||
*
|
||||
* @param name the value for jsh_materialcategory.Name
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
public void setName(String name) {
|
||||
this.name = name == null ? null : name.trim();
|
||||
}
|
||||
|
||||
/**
|
||||
* This method was generated by MyBatis Generator.
|
||||
* This method returns the value of the database column jsh_materialcategory.CategoryLevel
|
||||
*
|
||||
* @return the value of jsh_materialcategory.CategoryLevel
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
public Short getCategorylevel() {
|
||||
return categorylevel;
|
||||
}
|
||||
|
||||
/**
|
||||
* This method was generated by MyBatis Generator.
|
||||
* This method sets the value of the database column jsh_materialcategory.CategoryLevel
|
||||
*
|
||||
* @param categorylevel the value for jsh_materialcategory.CategoryLevel
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
public void setCategorylevel(Short categorylevel) {
|
||||
this.categorylevel = categorylevel;
|
||||
}
|
||||
|
||||
/**
|
||||
* This method was generated by MyBatis Generator.
|
||||
* This method returns the value of the database column jsh_materialcategory.ParentId
|
||||
*
|
||||
* @return the value of jsh_materialcategory.ParentId
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
public Long getParentid() {
|
||||
return parentid;
|
||||
}
|
||||
|
||||
/**
|
||||
* This method was generated by MyBatis Generator.
|
||||
* This method sets the value of the database column jsh_materialcategory.ParentId
|
||||
*
|
||||
* @param parentid the value for jsh_materialcategory.ParentId
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
public void setParentid(Long parentid) {
|
||||
this.parentid = parentid;
|
||||
}
|
||||
package com.jsh.erp.datasource.entities;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
public class MaterialCategory {
|
||||
/**
|
||||
* This field was generated by MyBatis Generator.
|
||||
* This field corresponds to the database column jsh_materialcategory.Id
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* This field was generated by MyBatis Generator.
|
||||
* This field corresponds to the database column jsh_materialcategory.Name
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
private String name;
|
||||
|
||||
/**
|
||||
* This field was generated by MyBatis Generator.
|
||||
* This field corresponds to the database column jsh_materialcategory.CategoryLevel
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
private Short categorylevel;
|
||||
|
||||
/**
|
||||
* This field was generated by MyBatis Generator.
|
||||
* This field corresponds to the database column jsh_materialcategory.ParentId
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
private Long parentid;
|
||||
|
||||
/**
|
||||
* This field was generated by MyBatis Generator.
|
||||
* This field corresponds to the database column jsh_materialcategory.sort
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
private String sort;
|
||||
|
||||
/**
|
||||
* This field was generated by MyBatis Generator.
|
||||
* This field corresponds to the database column jsh_materialcategory.status
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
private String status;
|
||||
|
||||
/**
|
||||
* This field was generated by MyBatis Generator.
|
||||
* This field corresponds to the database column jsh_materialcategory.serial_no
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
private String serialNo;
|
||||
|
||||
/**
|
||||
* This field was generated by MyBatis Generator.
|
||||
* This field corresponds to the database column jsh_materialcategory.remark
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
/**
|
||||
* This field was generated by MyBatis Generator.
|
||||
* This field corresponds to the database column jsh_materialcategory.create_time
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
private Date createTime;
|
||||
|
||||
/**
|
||||
* This field was generated by MyBatis Generator.
|
||||
* This field corresponds to the database column jsh_materialcategory.creator
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
private Long creator;
|
||||
|
||||
/**
|
||||
* This field was generated by MyBatis Generator.
|
||||
* This field corresponds to the database column jsh_materialcategory.update_time
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
private Date updateTime;
|
||||
|
||||
/**
|
||||
* This field was generated by MyBatis Generator.
|
||||
* This field corresponds to the database column jsh_materialcategory.updater
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
private Long updater;
|
||||
|
||||
/**
|
||||
* This method was generated by MyBatis Generator.
|
||||
* This method returns the value of the database column jsh_materialcategory.Id
|
||||
*
|
||||
* @return the value of jsh_materialcategory.Id
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
public Long getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
/**
|
||||
* This method was generated by MyBatis Generator.
|
||||
* This method sets the value of the database column jsh_materialcategory.Id
|
||||
*
|
||||
* @param id the value for jsh_materialcategory.Id
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
public void setId(Long id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
/**
|
||||
* This method was generated by MyBatis Generator.
|
||||
* This method returns the value of the database column jsh_materialcategory.Name
|
||||
*
|
||||
* @return the value of jsh_materialcategory.Name
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
/**
|
||||
* This method was generated by MyBatis Generator.
|
||||
* This method sets the value of the database column jsh_materialcategory.Name
|
||||
*
|
||||
* @param name the value for jsh_materialcategory.Name
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
public void setName(String name) {
|
||||
this.name = name == null ? null : name.trim();
|
||||
}
|
||||
|
||||
/**
|
||||
* This method was generated by MyBatis Generator.
|
||||
* This method returns the value of the database column jsh_materialcategory.CategoryLevel
|
||||
*
|
||||
* @return the value of jsh_materialcategory.CategoryLevel
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
public Short getCategorylevel() {
|
||||
return categorylevel;
|
||||
}
|
||||
|
||||
/**
|
||||
* This method was generated by MyBatis Generator.
|
||||
* This method sets the value of the database column jsh_materialcategory.CategoryLevel
|
||||
*
|
||||
* @param categorylevel the value for jsh_materialcategory.CategoryLevel
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
public void setCategorylevel(Short categorylevel) {
|
||||
this.categorylevel = categorylevel;
|
||||
}
|
||||
|
||||
/**
|
||||
* This method was generated by MyBatis Generator.
|
||||
* This method returns the value of the database column jsh_materialcategory.ParentId
|
||||
*
|
||||
* @return the value of jsh_materialcategory.ParentId
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
public Long getParentid() {
|
||||
return parentid;
|
||||
}
|
||||
|
||||
/**
|
||||
* This method was generated by MyBatis Generator.
|
||||
* This method sets the value of the database column jsh_materialcategory.ParentId
|
||||
*
|
||||
* @param parentid the value for jsh_materialcategory.ParentId
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
public void setParentid(Long parentid) {
|
||||
this.parentid = parentid;
|
||||
}
|
||||
|
||||
/**
|
||||
* This method was generated by MyBatis Generator.
|
||||
* This method returns the value of the database column jsh_materialcategory.sort
|
||||
*
|
||||
* @return the value of jsh_materialcategory.sort
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
public String getSort() {
|
||||
return sort;
|
||||
}
|
||||
|
||||
/**
|
||||
* This method was generated by MyBatis Generator.
|
||||
* This method sets the value of the database column jsh_materialcategory.sort
|
||||
*
|
||||
* @param sort the value for jsh_materialcategory.sort
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
public void setSort(String sort) {
|
||||
this.sort = sort == null ? null : sort.trim();
|
||||
}
|
||||
|
||||
/**
|
||||
* This method was generated by MyBatis Generator.
|
||||
* This method returns the value of the database column jsh_materialcategory.status
|
||||
*
|
||||
* @return the value of jsh_materialcategory.status
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
public String getStatus() {
|
||||
return status;
|
||||
}
|
||||
|
||||
/**
|
||||
* This method was generated by MyBatis Generator.
|
||||
* This method sets the value of the database column jsh_materialcategory.status
|
||||
*
|
||||
* @param status the value for jsh_materialcategory.status
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
public void setStatus(String status) {
|
||||
this.status = status == null ? null : status.trim();
|
||||
}
|
||||
|
||||
/**
|
||||
* This method was generated by MyBatis Generator.
|
||||
* This method returns the value of the database column jsh_materialcategory.serial_no
|
||||
*
|
||||
* @return the value of jsh_materialcategory.serial_no
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
public String getSerialNo() {
|
||||
return serialNo;
|
||||
}
|
||||
|
||||
/**
|
||||
* This method was generated by MyBatis Generator.
|
||||
* This method sets the value of the database column jsh_materialcategory.serial_no
|
||||
*
|
||||
* @param serialNo the value for jsh_materialcategory.serial_no
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
public void setSerialNo(String serialNo) {
|
||||
this.serialNo = serialNo == null ? null : serialNo.trim();
|
||||
}
|
||||
|
||||
/**
|
||||
* This method was generated by MyBatis Generator.
|
||||
* This method returns the value of the database column jsh_materialcategory.remark
|
||||
*
|
||||
* @return the value of jsh_materialcategory.remark
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
public String getRemark() {
|
||||
return remark;
|
||||
}
|
||||
|
||||
/**
|
||||
* This method was generated by MyBatis Generator.
|
||||
* This method sets the value of the database column jsh_materialcategory.remark
|
||||
*
|
||||
* @param remark the value for jsh_materialcategory.remark
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
public void setRemark(String remark) {
|
||||
this.remark = remark == null ? null : remark.trim();
|
||||
}
|
||||
|
||||
/**
|
||||
* This method was generated by MyBatis Generator.
|
||||
* This method returns the value of the database column jsh_materialcategory.create_time
|
||||
*
|
||||
* @return the value of jsh_materialcategory.create_time
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
public Date getCreateTime() {
|
||||
return createTime;
|
||||
}
|
||||
|
||||
/**
|
||||
* This method was generated by MyBatis Generator.
|
||||
* This method sets the value of the database column jsh_materialcategory.create_time
|
||||
*
|
||||
* @param createTime the value for jsh_materialcategory.create_time
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
public void setCreateTime(Date createTime) {
|
||||
this.createTime = createTime;
|
||||
}
|
||||
|
||||
/**
|
||||
* This method was generated by MyBatis Generator.
|
||||
* This method returns the value of the database column jsh_materialcategory.creator
|
||||
*
|
||||
* @return the value of jsh_materialcategory.creator
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
public Long getCreator() {
|
||||
return creator;
|
||||
}
|
||||
|
||||
/**
|
||||
* This method was generated by MyBatis Generator.
|
||||
* This method sets the value of the database column jsh_materialcategory.creator
|
||||
*
|
||||
* @param creator the value for jsh_materialcategory.creator
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
public void setCreator(Long creator) {
|
||||
this.creator = creator;
|
||||
}
|
||||
|
||||
/**
|
||||
* This method was generated by MyBatis Generator.
|
||||
* This method returns the value of the database column jsh_materialcategory.update_time
|
||||
*
|
||||
* @return the value of jsh_materialcategory.update_time
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
public Date getUpdateTime() {
|
||||
return updateTime;
|
||||
}
|
||||
|
||||
/**
|
||||
* This method was generated by MyBatis Generator.
|
||||
* This method sets the value of the database column jsh_materialcategory.update_time
|
||||
*
|
||||
* @param updateTime the value for jsh_materialcategory.update_time
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
public void setUpdateTime(Date updateTime) {
|
||||
this.updateTime = updateTime;
|
||||
}
|
||||
|
||||
/**
|
||||
* This method was generated by MyBatis Generator.
|
||||
* This method returns the value of the database column jsh_materialcategory.updater
|
||||
*
|
||||
* @return the value of jsh_materialcategory.updater
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
public Long getUpdater() {
|
||||
return updater;
|
||||
}
|
||||
|
||||
/**
|
||||
* This method was generated by MyBatis Generator.
|
||||
* This method sets the value of the database column jsh_materialcategory.updater
|
||||
*
|
||||
* @param updater the value for jsh_materialcategory.updater
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
public void setUpdater(Long updater) {
|
||||
this.updater = updater;
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,106 +1,96 @@
|
||||
package com.jsh.erp.datasource.mappers;
|
||||
|
||||
import com.jsh.erp.datasource.entities.MaterialCategory;
|
||||
import com.jsh.erp.datasource.entities.MaterialCategoryExample;
|
||||
import java.util.List;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
public interface MaterialCategoryMapper {
|
||||
/**
|
||||
* This method was generated by MyBatis Generator.
|
||||
* This method corresponds to the database table jsh_materialcategory
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
int countByExample(MaterialCategoryExample example);
|
||||
|
||||
/**
|
||||
* This method was generated by MyBatis Generator.
|
||||
* This method corresponds to the database table jsh_materialcategory
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
int deleteByExample(MaterialCategoryExample example);
|
||||
|
||||
/**
|
||||
* This method was generated by MyBatis Generator.
|
||||
* This method corresponds to the database table jsh_materialcategory
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
int deleteByPrimaryKey(Long id);
|
||||
|
||||
/**
|
||||
* This method was generated by MyBatis Generator.
|
||||
* This method corresponds to the database table jsh_materialcategory
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
int insert(MaterialCategory record);
|
||||
|
||||
/**
|
||||
* This method was generated by MyBatis Generator.
|
||||
* This method corresponds to the database table jsh_materialcategory
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
int insertSelective(MaterialCategory record);
|
||||
|
||||
/**
|
||||
* This method was generated by MyBatis Generator.
|
||||
* This method corresponds to the database table jsh_materialcategory
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
List<MaterialCategory> selectByExample(MaterialCategoryExample example);
|
||||
|
||||
/**
|
||||
* This method was generated by MyBatis Generator.
|
||||
* This method corresponds to the database table jsh_materialcategory
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
MaterialCategory selectByPrimaryKey(Long id);
|
||||
|
||||
/**
|
||||
* This method was generated by MyBatis Generator.
|
||||
* This method corresponds to the database table jsh_materialcategory
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
int updateByExampleSelective(@Param("record") MaterialCategory record, @Param("example") MaterialCategoryExample example);
|
||||
|
||||
/**
|
||||
* This method was generated by MyBatis Generator.
|
||||
* This method corresponds to the database table jsh_materialcategory
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
int updateByExample(@Param("record") MaterialCategory record, @Param("example") MaterialCategoryExample example);
|
||||
|
||||
/**
|
||||
* This method was generated by MyBatis Generator.
|
||||
* This method corresponds to the database table jsh_materialcategory
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
int updateByPrimaryKeySelective(MaterialCategory record);
|
||||
|
||||
/**
|
||||
* This method was generated by MyBatis Generator.
|
||||
* This method corresponds to the database table jsh_materialcategory
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
int updateByPrimaryKey(MaterialCategory record);
|
||||
|
||||
List<MaterialCategory> selectByConditionMaterialCategory(
|
||||
@Param("name") String name,
|
||||
@Param("parentId") Integer parentId,
|
||||
@Param("offset") Integer offset,
|
||||
@Param("rows") Integer rows);
|
||||
|
||||
int countsByMaterialCategory(
|
||||
@Param("name") String name,
|
||||
@Param("parentId") Integer parentId);
|
||||
package com.jsh.erp.datasource.mappers;
|
||||
|
||||
import com.jsh.erp.datasource.entities.MaterialCategory;
|
||||
import com.jsh.erp.datasource.entities.MaterialCategoryExample;
|
||||
import java.util.List;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
public interface MaterialCategoryMapper {
|
||||
/**
|
||||
* This method was generated by MyBatis Generator.
|
||||
* This method corresponds to the database table jsh_materialcategory
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
int countByExample(MaterialCategoryExample example);
|
||||
|
||||
/**
|
||||
* This method was generated by MyBatis Generator.
|
||||
* This method corresponds to the database table jsh_materialcategory
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
int deleteByExample(MaterialCategoryExample example);
|
||||
|
||||
/**
|
||||
* This method was generated by MyBatis Generator.
|
||||
* This method corresponds to the database table jsh_materialcategory
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
int deleteByPrimaryKey(Long id);
|
||||
|
||||
/**
|
||||
* This method was generated by MyBatis Generator.
|
||||
* This method corresponds to the database table jsh_materialcategory
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
int insert(MaterialCategory record);
|
||||
|
||||
/**
|
||||
* This method was generated by MyBatis Generator.
|
||||
* This method corresponds to the database table jsh_materialcategory
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
int insertSelective(MaterialCategory record);
|
||||
|
||||
/**
|
||||
* This method was generated by MyBatis Generator.
|
||||
* This method corresponds to the database table jsh_materialcategory
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
List<MaterialCategory> selectByExample(MaterialCategoryExample example);
|
||||
|
||||
/**
|
||||
* This method was generated by MyBatis Generator.
|
||||
* This method corresponds to the database table jsh_materialcategory
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
MaterialCategory selectByPrimaryKey(Long id);
|
||||
|
||||
/**
|
||||
* This method was generated by MyBatis Generator.
|
||||
* This method corresponds to the database table jsh_materialcategory
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
int updateByExampleSelective(@Param("record") MaterialCategory record, @Param("example") MaterialCategoryExample example);
|
||||
|
||||
/**
|
||||
* This method was generated by MyBatis Generator.
|
||||
* This method corresponds to the database table jsh_materialcategory
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
int updateByExample(@Param("record") MaterialCategory record, @Param("example") MaterialCategoryExample example);
|
||||
|
||||
/**
|
||||
* This method was generated by MyBatis Generator.
|
||||
* This method corresponds to the database table jsh_materialcategory
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
int updateByPrimaryKeySelective(MaterialCategory record);
|
||||
|
||||
/**
|
||||
* This method was generated by MyBatis Generator.
|
||||
* This method corresponds to the database table jsh_materialcategory
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
int updateByPrimaryKey(MaterialCategory record);
|
||||
}
|
||||
@@ -0,0 +1,35 @@
|
||||
package com.jsh.erp.datasource.mappers;
|
||||
|
||||
import com.jsh.erp.datasource.entities.MaterialCategory;
|
||||
import com.jsh.erp.datasource.vo.TreeNode;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* Description
|
||||
*
|
||||
* @Author: cjl
|
||||
* @Date: 2019/2/18 17:23
|
||||
*/
|
||||
public interface MaterialCategoryMapperEx {
|
||||
List<MaterialCategory> selectByConditionMaterialCategory(
|
||||
@Param("name") String name,
|
||||
@Param("parentId") Integer parentId,
|
||||
@Param("offset") Integer offset,
|
||||
@Param("rows") Integer rows);
|
||||
|
||||
int countsByMaterialCategory(
|
||||
@Param("name") String name,
|
||||
@Param("parentId") Integer parentId);
|
||||
|
||||
List<TreeNode> getNodeTree();
|
||||
List<TreeNode> getNextNodeTree(@Param("id") Long id);
|
||||
|
||||
int addMaterialCategory(MaterialCategory mc);
|
||||
|
||||
int batchDeleteMaterialCategoryByIds(@Param("updateTime") Date updateTime, @Param("updater") Long updater, @Param("ids") String ids[]);
|
||||
|
||||
int editMaterialCategory(MaterialCategory mc);
|
||||
}
|
||||
96
src/main/java/com/jsh/erp/datasource/vo/TreeNode.java
Normal file
96
src/main/java/com/jsh/erp/datasource/vo/TreeNode.java
Normal file
@@ -0,0 +1,96 @@
|
||||
package com.jsh.erp.datasource.vo;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* Description
|
||||
* 树形结构基本元素
|
||||
* @Author: cjl
|
||||
* @Date: 2019/2/19 11:27
|
||||
*/
|
||||
public class TreeNode {
|
||||
/**
|
||||
* id主键
|
||||
* */
|
||||
private Long id;
|
||||
/**
|
||||
* text显示的文本
|
||||
* */
|
||||
private String text;
|
||||
/**
|
||||
*state节点状态,'open' 或 'closed',默认:'open'。如果为'closed'的时候,将不自动展开该节点。
|
||||
* */
|
||||
private String state="open";
|
||||
/**
|
||||
*iconCls 节点图标id
|
||||
* */
|
||||
private String iconCls;
|
||||
/**
|
||||
* checked 是否被选中
|
||||
* */
|
||||
private boolean checked;
|
||||
/**
|
||||
*attributes 自定义属性
|
||||
* */
|
||||
private String attributes;
|
||||
/**
|
||||
* children 子节点
|
||||
* */
|
||||
private List<TreeNode> children;
|
||||
|
||||
public Long getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(Long id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public String getText() {
|
||||
return text;
|
||||
}
|
||||
|
||||
public void setText(String text) {
|
||||
this.text = text;
|
||||
}
|
||||
|
||||
public String getState() {
|
||||
return state;
|
||||
}
|
||||
|
||||
public void setState(String state) {
|
||||
this.state = state;
|
||||
}
|
||||
|
||||
public String getIconCls() {
|
||||
return iconCls;
|
||||
}
|
||||
|
||||
public void setIconCls(String iconCls) {
|
||||
this.iconCls = iconCls;
|
||||
}
|
||||
|
||||
public boolean isChecked() {
|
||||
return checked;
|
||||
}
|
||||
|
||||
public void setChecked(boolean checked) {
|
||||
this.checked = checked;
|
||||
}
|
||||
|
||||
public String getAttributes() {
|
||||
return attributes;
|
||||
}
|
||||
|
||||
public void setAttributes(String attributes) {
|
||||
this.attributes = attributes;
|
||||
}
|
||||
|
||||
public List<TreeNode> getChildren() {
|
||||
return children;
|
||||
}
|
||||
|
||||
public void setChildren(List<TreeNode> children) {
|
||||
this.children = children;
|
||||
}
|
||||
}
|
||||
@@ -1,9 +1,14 @@
|
||||
package com.jsh.erp.service.materialCategory;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.jsh.erp.constants.BusinessConstants;
|
||||
import com.jsh.erp.datasource.entities.MaterialCategory;
|
||||
import com.jsh.erp.datasource.entities.MaterialCategoryExample;
|
||||
import com.jsh.erp.datasource.entities.User;
|
||||
import com.jsh.erp.datasource.mappers.MaterialCategoryMapper;
|
||||
import com.jsh.erp.datasource.mappers.MaterialCategoryMapperEx;
|
||||
import com.jsh.erp.datasource.vo.TreeNode;
|
||||
import com.jsh.erp.service.user.UserService;
|
||||
import com.jsh.erp.utils.StringUtil;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
@@ -12,6 +17,7 @@ import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
@Service
|
||||
@@ -20,6 +26,10 @@ public class MaterialCategoryService {
|
||||
|
||||
@Resource
|
||||
private MaterialCategoryMapper materialCategoryMapper;
|
||||
@Resource
|
||||
private MaterialCategoryMapperEx materialCategoryMapperEx;
|
||||
@Resource
|
||||
private UserService userService;
|
||||
|
||||
public MaterialCategory getMaterialCategory(long id) {
|
||||
return materialCategoryMapper.selectByPrimaryKey(id);
|
||||
@@ -38,11 +48,11 @@ public class MaterialCategoryService {
|
||||
}
|
||||
|
||||
public List<MaterialCategory> select(String name, Integer parentId, int offset, int rows) {
|
||||
return materialCategoryMapper.selectByConditionMaterialCategory(name, parentId, offset, rows);
|
||||
return materialCategoryMapperEx.selectByConditionMaterialCategory(name, parentId, offset, rows);
|
||||
}
|
||||
|
||||
public int countMaterialCategory(String name, Integer parentId) {
|
||||
return materialCategoryMapper.countsByMaterialCategory(name, parentId);
|
||||
return materialCategoryMapperEx.countsByMaterialCategory(name, parentId);
|
||||
}
|
||||
|
||||
@Transactional(value = "transactionManager", rollbackFor = Exception.class)
|
||||
@@ -80,4 +90,68 @@ public class MaterialCategoryService {
|
||||
example.createCriteria().andIdEqualTo(id);
|
||||
return materialCategoryMapper.selectByExample(example);
|
||||
}
|
||||
/**
|
||||
* create by: cjl
|
||||
* description:
|
||||
*获取商品类别树数据
|
||||
* create time: 2019/2/19 14:30
|
||||
* @Param:
|
||||
* @return java.util.List<com.jsh.erp.datasource.vo.TreeNode>
|
||||
*/
|
||||
public List<TreeNode> getMaterialCategoryTree() throws Exception{
|
||||
return materialCategoryMapperEx.getNodeTree();
|
||||
}
|
||||
/**
|
||||
* create by: cjl
|
||||
* description:
|
||||
* 新增商品类别信息
|
||||
* create time: 2019/2/19 16:30
|
||||
* @Param: mc
|
||||
* @return void
|
||||
*/
|
||||
public int addMaterialCategory(MaterialCategory mc) throws Exception {
|
||||
if(mc==null){
|
||||
return 0;
|
||||
}
|
||||
if(mc.getParentid()==null){
|
||||
//没有给定父级目录的id,默认设置父级目录为根目录
|
||||
mc.setParentid(BusinessConstants.MATERIAL_CATEGORY_ROOT_ID);
|
||||
}
|
||||
//数据状态新增时默认设置为启用
|
||||
mc.setStatus(BusinessConstants.MATERIAL_CATEGORY_STATUS_ENABLE);
|
||||
Date date=new Date();
|
||||
User userInfo=userService.getCurrentUser();
|
||||
//创建时间
|
||||
mc.setCreateTime(date);
|
||||
//创建人
|
||||
mc.setCreator(userInfo==null?null:userInfo.getId());
|
||||
//更新时间
|
||||
mc.setUpdateTime(date);
|
||||
//更新人
|
||||
mc.setUpdater(userInfo==null?null:userInfo.getId());
|
||||
return materialCategoryMapperEx.addMaterialCategory(mc);
|
||||
}
|
||||
|
||||
public int batchDeleteMaterialCategoryByIds(String ids) throws Exception {
|
||||
//更新时间
|
||||
Date updateDate =new Date();
|
||||
//更新人
|
||||
User userInfo=userService.getCurrentUser();
|
||||
Long updater=userInfo==null?null:userInfo.getId();
|
||||
StringBuffer sb=new StringBuffer();
|
||||
String strArray[]=ids.split(",");
|
||||
if(strArray.length<1){
|
||||
return 0;
|
||||
}
|
||||
return materialCategoryMapperEx.batchDeleteMaterialCategoryByIds(updateDate,updater,strArray);
|
||||
}
|
||||
|
||||
public int editMaterialCategory(MaterialCategory mc) {
|
||||
//更新时间
|
||||
mc.setUpdateTime(new Date());
|
||||
//更新人
|
||||
User userInfo=userService.getCurrentUser();
|
||||
mc.setUpdater(userInfo==null?null:userInfo.getId());
|
||||
return materialCategoryMapperEx.editMaterialCategory(mc);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user