Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
C
chnmuseum-party
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
liqin
chnmuseum-party
Commits
a06d83c1
Commit
a06d83c1
authored
Mar 25, 2021
by
liqin
💬
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug fixed
parent
b0a916b3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
31 additions
and
11 deletions
+31
-11
ExhibitionBoardCat.java
...n/wisenergy/chnmuseum/party/model/ExhibitionBoardCat.java
+10
-6
ExhibitionBoardCatController.java
...um/party/web/controller/ExhibitionBoardCatController.java
+17
-5
ExhibitionBoardController.java
...useum/party/web/controller/ExhibitionBoardController.java
+4
-0
No files found.
src/main/java/cn/wisenergy/chnmuseum/party/model/ExhibitionBoardCat.java
View file @
a06d83c1
...
...
@@ -39,19 +39,23 @@ public class ExhibitionBoardCat implements Serializable {
@ApiModelProperty
(
"展板分类名称"
)
@TableField
(
"name"
)
@NotBlank
(
message
=
"展板分类名称不能为空"
,
groups
=
{
Add
.
class
,
Update
.
class
})
private
String
name
;
@NotBlank
(
message
=
"展板分类名称不能为空"
,
groups
=
{
Add
.
class
,
Update
.
class
})
private
String
name
;
@ApiModelProperty
(
"备注"
)
@TableField
(
"remarks"
)
private
String
remarks
;
@ApiModelProperty
(
"创建日期"
)
@TableField
(
value
=
"create_time"
,
fill
=
FieldFill
.
INSERT
)
private
LocalDateTime
createTime
;
@ApiModelProperty
(
"修改日期"
)
@TableField
(
value
=
"update_time"
,
fill
=
FieldFill
.
INSERT_UPDATE
)
private
LocalDateTime
updateTime
;
@ApiModelProperty
(
"版权方"
)
@TableField
(
exist
=
false
)
private
String
copyrightOwnerNames
;
}
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/ExhibitionBoardCatController.java
View file @
a06d83c1
...
...
@@ -4,11 +4,16 @@ import cn.wisenergy.chnmuseum.party.common.enums.AuditStatusEnum;
import
cn.wisenergy.chnmuseum.party.common.validator.groups.Add
;
import
cn.wisenergy.chnmuseum.party.common.validator.groups.Update
;
import
cn.wisenergy.chnmuseum.party.common.vo.GenericPageParam
;
import
cn.wisenergy.chnmuseum.party.model.CopyrightOwner
;
import
cn.wisenergy.chnmuseum.party.model.ExhibitionBoard
;
import
cn.wisenergy.chnmuseum.party.model.ExhibitionBoardCat
;
import
cn.wisenergy.chnmuseum.party.service.CopyrightOwnerService
;
import
cn.wisenergy.chnmuseum.party.service.ExhibitionBoardCatService
;
import
cn.wisenergy.chnmuseum.party.service.ExhibitionBoardService
;
import
cn.wisenergy.chnmuseum.party.web.controller.base.BaseController
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper
;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiImplicitParam
;
...
...
@@ -24,6 +29,7 @@ import javax.annotation.Resource;
import
javax.validation.constraints.NotNull
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.stream.Collectors
;
/**
* <pre>
...
...
@@ -39,8 +45,12 @@ import java.util.Map;
@Api
(
tags
=
{
"展板分类操作接口"
})
public
class
ExhibitionBoardCatController
extends
BaseController
{
@Resource
private
ExhibitionBoardService
exhibitionBoardService
;
@Resource
private
ExhibitionBoardCatService
exhibitionBoardCatService
;
@Resource
private
CopyrightOwnerService
copyrightOwnerService
;
@PostMapping
(
"/batchSave"
)
@RequiresPermissions
(
"exhibition:board:cat:batch:save"
)
...
...
@@ -108,6 +118,7 @@ public class ExhibitionBoardCatController extends BaseController {
@ApiImplicitParam
(
name
=
"id"
,
value
=
"标识ID"
,
paramType
=
"path"
,
dataType
=
"String"
)
})
public
Map
<
String
,
Object
>
deleteExhibitionBoardCat
(
@PathVariable
(
"id"
)
String
id
)
{
boolean
result
=
exhibitionBoardCatService
.
removeById
(
id
);
if
(
result
)
{
return
getSuccessResult
();
...
...
@@ -155,11 +166,12 @@ public class ExhibitionBoardCatController extends BaseController {
ExhibitionBoardCat:
:
getUpdateTime
);
Page
<
ExhibitionBoardCat
>
page
=
this
.
exhibitionBoardCatService
.
page
(
getPage
(),
queryWrapper
);
for
(
ExhibitionBoardCat
exhibitionBoardCat
:
page
.
getRecords
())
{
LambdaQueryWrapper
<
ExhibitionBoard
>
lambdaQueryWrapper
=
Wrappers
.<
ExhibitionBoard
>
lambdaQuery
().
le
(
ExhibitionBoard:
:
getExhibitionBoardCatId
,
exhibitionBoardCat
.
getId
());
List
<
ExhibitionBoard
>
exhibitionBoardList
=
this
.
exhibitionBoardService
.
list
(
lambdaQueryWrapper
);
List
<
String
>
boardCopyrightOwnerIdList
=
exhibitionBoardList
.
stream
().
map
(
ExhibitionBoard:
:
getBoardCopyrightOwnerId
).
collect
(
Collectors
.
toList
());
List
<
CopyrightOwner
>
copyrightOwnerList
=
this
.
copyrightOwnerService
.
listByIds
(
boardCopyrightOwnerIdList
);
String
copyrightOwnerNames
=
copyrightOwnerList
.
stream
().
map
(
CopyrightOwner:
:
getName
).
collect
(
Collectors
.
joining
(
"、"
));
exhibitionBoardCat
.
setCopyrightOwnerNames
(
copyrightOwnerNames
);
}
return
getResult
(
page
);
}
...
...
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/ExhibitionBoardController.java
View file @
a06d83c1
...
...
@@ -167,6 +167,10 @@ public class ExhibitionBoardController extends BaseController {
Page
<
ExhibitionBoard
>
page
=
this
.
exhibitionBoardService
.
page
(
getPage
(),
queryWrapper
);
for
(
ExhibitionBoard
exhibitionBoard
:
page
.
getRecords
())
{
}
return
getResult
(
page
);
}
...
...
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