Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
operation-control-platform
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
王锦盛
operation-control-platform
Commits
93e4c1f2
Commit
93e4c1f2
authored
Mar 10, 2022
by
王锦盛
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改
parent
0218aadd
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
6 deletions
+12
-6
src/main/java/com/pms/ocp/controller/ModelBaseController.java
...main/java/com/pms/ocp/controller/ModelBaseController.java
+6
-4
src/main/java/com/pms/ocp/service/ModelPropertyService.java
src/main/java/com/pms/ocp/service/ModelPropertyService.java
+1
-1
src/main/java/com/pms/ocp/service/impl/ModelPropertyServiceImpl.java
...va/com/pms/ocp/service/impl/ModelPropertyServiceImpl.java
+5
-1
No files found.
src/main/java/com/pms/ocp/controller/ModelBaseController.java
View file @
93e4c1f2
...
...
@@ -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
));
}
...
...
src/main/java/com/pms/ocp/service/ModelPropertyService.java
View file @
93e4c1f2
...
...
@@ -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
);
/**
* 获取模型属性列表
...
...
src/main/java/com/pms/ocp/service/impl/ModelPropertyServiceImpl.java
View file @
93e4c1f2
...
...
@@ -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
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment