Commit 93e4c1f2 authored by 王锦盛's avatar 王锦盛

修改

parent 0218aadd
......@@ -13,6 +13,7 @@ import com.pms.ocp.service.ModelPropertyService;
import com.pms.ocp.service.ModelService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -237,9 +238,10 @@ public class ModelBaseController {
*/
@ApiOperation("模型属性-查询")
@GetMapping("get/model/property")
public ResponseVO getModelProperty(@RequestParam(value = "modelCode", required = false) String modelCode,
@RequestParam(value = "propCode", required = false) String propCode) {
return ResponseVO.ok(modelPropertyService.listModelProperty(modelCode, propCode));
public ResponseVO getModelProperty(@ApiParam(value = "模型属性编号") @RequestParam(value = "objId", required = false) String objId,
@ApiParam(value = "模型编码") @RequestParam(value = "modelCode", required = false) String modelCode,
@ApiParam(value = "属性编码") @RequestParam(value = "propCode", required = false) String propCode) {
return ResponseVO.ok(modelPropertyService.listModelProperty(objId, modelCode, propCode));
}
/**
......@@ -261,7 +263,7 @@ public class ModelBaseController {
*/
@ApiOperation("模型属性-删除/批量删除")
@PostMapping("/delete/model/property")
public ResponseVO deleteModelProperty(@RequestBody List<String> ids) {
public ResponseVO deleteModelProperty(@ApiParam(value = "属性ID集合") @RequestBody List<String> ids) {
return ResponseVO.ok(modelPropertyService.deletePatchModelProperty(ids));
}
......
......@@ -51,7 +51,7 @@ public interface ModelPropertyService {
* @param
* @return
*/
List<ModelProperty> listModelProperty(String modelCode, String propCode);
List<ModelProperty> listModelProperty(String objId, String modelCode, String propCode);
/**
* 获取模型属性列表
......
......@@ -75,10 +75,14 @@ public class ModelPropertyServiceImpl implements ModelPropertyService {
}
@Override
public List<ModelProperty> listModelProperty(String modelCode, String propCode) {
public List<ModelProperty> listModelProperty(String objId, String modelCode, String propCode) {
QueryWrapper<ModelProperty> queryWrapper = new QueryWrapper();
if (StringUtils.isNotEmpty(objId)) {
queryWrapper.lambda().eq(ModelProperty::getObjId, objId);
}
if (StringUtils.isNotEmpty(modelCode)) {
queryWrapper.lambda().eq(ModelProperty::getModelCode, modelCode);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment