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
f0453ff0
Commit
f0453ff0
authored
Apr 02, 2021
by
liqin
💬
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug fixed
parent
56bb1476
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
54 additions
and
5 deletions
+54
-5
ExhibitionBoard.java
...a/cn/wisenergy/chnmuseum/party/model/ExhibitionBoard.java
+4
-0
LearningContent.java
...a/cn/wisenergy/chnmuseum/party/model/LearningContent.java
+4
-0
VideoContent.java
...java/cn/wisenergy/chnmuseum/party/model/VideoContent.java
+4
-0
ExhibitionBoardController.java
...useum/party/web/controller/ExhibitionBoardController.java
+13
-0
LearningContentController.java
...useum/party/web/controller/LearningContentController.java
+13
-0
SysLogController.java
...ergy/chnmuseum/party/web/controller/SysLogController.java
+3
-5
VideoContentController.java
...hnmuseum/party/web/controller/VideoContentController.java
+13
-0
No files found.
src/main/java/cn/wisenergy/chnmuseum/party/model/ExhibitionBoard.java
View file @
f0453ff0
...
...
@@ -158,4 +158,8 @@ public class ExhibitionBoard implements Serializable {
@TableField
(
exist
=
false
)
private
List
<
Asset
>
datumList
;
@ApiModelProperty
(
"审核意见记录"
)
@TableField
(
exist
=
false
)
private
List
<
Audit
>
auditHistoryList
;
}
src/main/java/cn/wisenergy/chnmuseum/party/model/LearningContent.java
View file @
f0453ff0
...
...
@@ -133,4 +133,8 @@ public class LearningContent implements Serializable {
@TableField
(
exist
=
false
)
private
String
copyrightOwnerNames
;
@ApiModelProperty
(
"审核意见记录"
)
@TableField
(
exist
=
false
)
private
List
<
Audit
>
auditHistoryList
;
}
src/main/java/cn/wisenergy/chnmuseum/party/model/VideoContent.java
View file @
f0453ff0
...
...
@@ -93,4 +93,8 @@ public class VideoContent implements Serializable {
@TableField
(
exist
=
false
)
private
List
<
Asset
>
videoFileList
;
@ApiModelProperty
(
"审核意见记录"
)
@TableField
(
exist
=
false
)
private
List
<
Audit
>
auditHistoryList
;
}
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/ExhibitionBoardController.java
View file @
f0453ff0
...
...
@@ -321,6 +321,19 @@ public class ExhibitionBoardController extends BaseController {
final
List
<
Asset
>
datumList
=
this
.
assetService
.
list
(
assetQueryWrapper
);
exhibitionBoard
.
setDatumList
(
datumList
);
final
LambdaQueryWrapper
<
Audit
>
auditQueryWrapper
=
Wrappers
.<
Audit
>
lambdaQuery
().
eq
(
Audit:
:
getRefItemId
,
id
);
auditQueryWrapper
.
select
(
Audit:
:
getContent
);
auditQueryWrapper
.
select
(
Audit:
:
getType
);
auditQueryWrapper
.
select
(
Audit:
:
getOperation
);
auditQueryWrapper
.
select
(
Audit:
:
getStatus
);
auditQueryWrapper
.
select
(
Audit:
:
getFirstTime
);
auditQueryWrapper
.
select
(
Audit:
:
getFirstRemarks
);
auditQueryWrapper
.
select
(
Audit:
:
getSecondTime
);
auditQueryWrapper
.
select
(
Audit:
:
getSecondTime
);
auditQueryWrapper
.
select
(
Audit:
:
getLevel
);
final
List
<
Audit
>
auditList
=
this
.
auditService
.
list
(
auditQueryWrapper
);
exhibitionBoard
.
setAuditHistoryList
(
auditList
);
final
String
videoContentId
=
exhibitionBoard
.
getVideoContentId
();
if
(
videoContentId
!=
null
)
{
final
VideoContent
videoContent
=
this
.
videoContentService
.
getById
(
videoContentId
);
...
...
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/LearningContentController.java
View file @
f0453ff0
...
...
@@ -323,6 +323,19 @@ public class LearningContentController extends BaseController {
learningContent
.
setExhibitionBoardIdList
(
exhibitionBoardList
.
stream
().
map
(
ExhibitionBoard:
:
getId
).
collect
(
Collectors
.
toList
()));
learningContent
.
setExhibitionBoardNameList
(
exhibitionBoardList
.
stream
().
map
(
ExhibitionBoard:
:
getName
).
collect
(
Collectors
.
toList
()));
final
LambdaQueryWrapper
<
Audit
>
auditQueryWrapper
=
Wrappers
.<
Audit
>
lambdaQuery
().
eq
(
Audit:
:
getRefItemId
,
id
);
auditQueryWrapper
.
select
(
Audit:
:
getContent
);
auditQueryWrapper
.
select
(
Audit:
:
getType
);
auditQueryWrapper
.
select
(
Audit:
:
getOperation
);
auditQueryWrapper
.
select
(
Audit:
:
getStatus
);
auditQueryWrapper
.
select
(
Audit:
:
getFirstTime
);
auditQueryWrapper
.
select
(
Audit:
:
getFirstRemarks
);
auditQueryWrapper
.
select
(
Audit:
:
getSecondTime
);
auditQueryWrapper
.
select
(
Audit:
:
getSecondTime
);
auditQueryWrapper
.
select
(
Audit:
:
getLevel
);
final
List
<
Audit
>
auditList
=
this
.
auditService
.
list
(
auditQueryWrapper
);
learningContent
.
setAuditHistoryList
(
auditList
);
for
(
ExhibitionBoard
exhibitionBoard
:
exhibitionBoardList
)
{
String
exhibitionBoardCatId
=
exhibitionBoard
.
getExhibitionBoardCatId
();
if
(
exhibitionBoardCatId
!=
null
)
{
...
...
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/SysLogController.java
View file @
f0453ff0
...
...
@@ -4,14 +4,14 @@ import cn.wisenergy.chnmuseum.party.common.log.OperType;
import
cn.wisenergy.chnmuseum.party.common.util.DateUtil80
;
import
cn.wisenergy.chnmuseum.party.common.util.NetWorkUtil
;
import
cn.wisenergy.chnmuseum.party.common.vo.GenericPageParam
;
import
cn.wisenergy.chnmuseum.party.model.*
;
import
cn.wisenergy.chnmuseum.party.model.RunLog
;
import
cn.wisenergy.chnmuseum.party.model.SysLog
;
import
cn.wisenergy.chnmuseum.party.model.TOperationLog
;
import
cn.wisenergy.chnmuseum.party.service.TOperationLogService
;
import
cn.wisenergy.chnmuseum.party.service.impl.RunLogServiceImpl
;
import
cn.wisenergy.chnmuseum.party.service.impl.SysLogServiceImpl
;
import
cn.wisenergy.chnmuseum.party.web.controller.base.BaseController
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiImplicitParam
;
...
...
@@ -19,8 +19,6 @@ import io.swagger.annotations.ApiImplicitParams;
import
io.swagger.annotations.ApiOperation
;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.shiro.authz.annotation.RequiresPermissions
;
import
org.springframework.http.HttpStatus
;
import
org.springframework.http.ResponseEntity
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.PostMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
...
...
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/VideoContentController.java
View file @
f0453ff0
...
...
@@ -259,6 +259,19 @@ public class VideoContentController extends BaseController {
final
List
<
Asset
>
videoFileList
=
this
.
assetService
.
list
(
assetQueryWrapper
);
videoContent
.
setVideoFileList
(
videoFileList
);
final
LambdaQueryWrapper
<
Audit
>
auditQueryWrapper
=
Wrappers
.<
Audit
>
lambdaQuery
().
eq
(
Audit:
:
getRefItemId
,
id
);
auditQueryWrapper
.
select
(
Audit:
:
getContent
);
auditQueryWrapper
.
select
(
Audit:
:
getType
);
auditQueryWrapper
.
select
(
Audit:
:
getOperation
);
auditQueryWrapper
.
select
(
Audit:
:
getStatus
);
auditQueryWrapper
.
select
(
Audit:
:
getFirstTime
);
auditQueryWrapper
.
select
(
Audit:
:
getFirstRemarks
);
auditQueryWrapper
.
select
(
Audit:
:
getSecondTime
);
auditQueryWrapper
.
select
(
Audit:
:
getSecondTime
);
auditQueryWrapper
.
select
(
Audit:
:
getLevel
);
final
List
<
Audit
>
auditList
=
this
.
auditService
.
list
(
auditQueryWrapper
);
videoContent
.
setAuditHistoryList
(
auditList
);
return
getResult
(
videoContent
);
}
...
...
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