完善多属性模块的接口
This commit is contained in:
@@ -1,7 +1,9 @@
|
||||
package com.jsh.erp.controller;
|
||||
|
||||
import com.alibaba.fastjson.JSONArray;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.jsh.erp.datasource.entities.MaterialAttribute;
|
||||
import com.jsh.erp.datasource.entities.Person;
|
||||
import com.jsh.erp.service.materialAttribute.MaterialAttributeService;
|
||||
import com.jsh.erp.utils.BaseResponseInfo;
|
||||
import io.swagger.annotations.Api;
|
||||
@@ -30,24 +32,45 @@ public class MaterialAttributeController {
|
||||
private MaterialAttributeService materialAttributeService;
|
||||
|
||||
/**
|
||||
* 获取全部商品属性
|
||||
* 获取商品属性的名称列表
|
||||
* @param request
|
||||
* @return
|
||||
* @throws Exception
|
||||
*/
|
||||
@GetMapping("/getAll")
|
||||
@ApiOperation(value = "获取全部商品属性")
|
||||
public BaseResponseInfo getAll(HttpServletRequest request)throws Exception {
|
||||
BaseResponseInfo res = new BaseResponseInfo();
|
||||
@GetMapping(value = "/getNameList")
|
||||
@ApiOperation(value = "获取商品属性的名称列表")
|
||||
public JSONArray getNameList(HttpServletRequest request)throws Exception {
|
||||
JSONArray dataArray = new JSONArray();
|
||||
try {
|
||||
JSONObject obj = materialAttributeService.getAll();
|
||||
res.code = 200;
|
||||
res.data = obj;
|
||||
List<MaterialAttribute> materialAttributeList = materialAttributeService.getMaterialAttribute();
|
||||
if (null != materialAttributeList) {
|
||||
for (MaterialAttribute materialAttribute : materialAttributeList) {
|
||||
JSONObject item = new JSONObject();
|
||||
item.put("value", materialAttribute.getId().toString());
|
||||
item.put("name", materialAttribute.getAttributeName());
|
||||
dataArray.add(item);
|
||||
}
|
||||
}
|
||||
} catch(Exception e){
|
||||
e.printStackTrace();
|
||||
res.code = 500;
|
||||
res.data = "获取数据失败";
|
||||
}
|
||||
return res;
|
||||
return dataArray;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取id查询属性的值列表
|
||||
* @param request
|
||||
* @return
|
||||
*/
|
||||
@GetMapping(value = "/getValueListById")
|
||||
@ApiOperation(value = "获取id查询属性的值列表")
|
||||
public JSONArray getValueListById(@RequestParam("id") Long id,
|
||||
HttpServletRequest request)throws Exception {
|
||||
JSONArray dataArray = new JSONArray();
|
||||
try {
|
||||
dataArray = materialAttributeService.getValueArrById(id);
|
||||
} catch(Exception e){
|
||||
e.printStackTrace();
|
||||
}
|
||||
return dataArray;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -164,57 +164,9 @@ public class MaterialAttributeService {
|
||||
return list==null?0:list.size();
|
||||
}
|
||||
|
||||
public JSONObject getAll() {
|
||||
JSONObject obj = new JSONObject();
|
||||
//属性名
|
||||
obj.put("manyColorName", getNameByField("manyColor"));
|
||||
obj.put("manySizeName", getNameByField("manySize"));
|
||||
obj.put("other1Name", getNameByField("other1"));
|
||||
obj.put("other2Name", getNameByField("other2"));
|
||||
obj.put("other3Name", getNameByField("other3"));
|
||||
//属性值
|
||||
obj.put("manyColorValue", getValueArrByField("manyColor"));
|
||||
obj.put("manySizeValue", getValueArrByField("manySize"));
|
||||
obj.put("other1Value", getValueArrByField("other1"));
|
||||
obj.put("other2Value", getValueArrByField("other2"));
|
||||
obj.put("other3Value", getValueArrByField("other3"));
|
||||
return obj;
|
||||
}
|
||||
|
||||
public MaterialAttribute getInfoByField(String field) {
|
||||
MaterialAttributeExample example = new MaterialAttributeExample();
|
||||
example.createCriteria().andAttributeFieldEqualTo(field).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
|
||||
List<MaterialAttribute> list = materialAttributeMapper.selectByExample(example);
|
||||
if(list!=null && list.size()>0) {
|
||||
return list.get(0);
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
public String getNameByField(String field) {
|
||||
String res = "";
|
||||
if("manyColor".equals(field)){
|
||||
res = "多颜色";
|
||||
} else if("manySize".equals(field)){
|
||||
res = "多尺寸";
|
||||
} else if("other1".equals(field)){
|
||||
res = "自定义1";
|
||||
} else if("other2".equals(field)){
|
||||
res = "自定义2";
|
||||
} else if("other3".equals(field)){
|
||||
res = "自定义3";
|
||||
}
|
||||
MaterialAttribute ma = getInfoByField(field);
|
||||
if(ma!=null && StringUtil.isNotEmpty(ma.getAttributeName())) {
|
||||
res = ma.getAttributeName();
|
||||
}
|
||||
return res;
|
||||
}
|
||||
|
||||
public JSONArray getValueArrByField(String field) {
|
||||
public JSONArray getValueArrById(Long id) {
|
||||
JSONArray valueArr = new JSONArray();
|
||||
MaterialAttribute ma = getInfoByField(field);
|
||||
MaterialAttribute ma = getInfoById(id);
|
||||
if(ma!=null) {
|
||||
String value = ma.getAttributeValue();
|
||||
if(StringUtil.isNotEmpty(value)){
|
||||
@@ -229,4 +181,15 @@ public class MaterialAttributeService {
|
||||
}
|
||||
return valueArr;
|
||||
}
|
||||
|
||||
public MaterialAttribute getInfoById(Long id) {
|
||||
MaterialAttributeExample example = new MaterialAttributeExample();
|
||||
example.createCriteria().andIdEqualTo(id).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
|
||||
List<MaterialAttribute> list = materialAttributeMapper.selectByExample(example);
|
||||
if(list!=null && list.size()>0) {
|
||||
return list.get(0);
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user