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
46ce6fd1
Commit
46ce6fd1
authored
Apr 20, 2021
by
jiawei
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/dev'
parents
03c4b026
e82d56ae
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
1 addition
and
36 deletions
+1
-36
AuditServiceImpl.java
...energy/chnmuseum/party/service/impl/AuditServiceImpl.java
+1
-10
AuditController.java
...nergy/chnmuseum/party/web/controller/AuditController.java
+0
-14
CopyrightOwnerController.java
...museum/party/web/controller/CopyrightOwnerController.java
+0
-5
ExhibitionBoardCatController.java
...um/party/web/controller/ExhibitionBoardCatController.java
+0
-3
VideoContentCatController.java
...useum/party/web/controller/VideoContentCatController.java
+0
-4
No files found.
src/main/java/cn/wisenergy/chnmuseum/party/service/impl/AuditServiceImpl.java
View file @
46ce6fd1
...
...
@@ -195,14 +195,9 @@ public class AuditServiceImpl extends ServiceImpl<AuditMapper, Audit> implements
// //修改对应审核项中的信息
// updateRefItemByRefItemId = updateRefItemByRefItemId(audit);
// }
//通过与不通过时 都修改
boolean
updateRefItemByRefItemId
=
updateRefItemByRefItemId
(
audit
);
if
(
AuditOperationEnum
.
REMOVE
.
name
().
equals
(
audit
.
getOperation
()))
{
return
updateRefItemByRefItemId
;
}
if
(
AuditOperationEnum
.
EDIT
.
name
().
equals
(
audit
.
getOperation
()))
{
//todo
}
int
update
=
auditMapper
.
updateById
(
audit
);
return
updateRefItemByRefItemId
&&
update
>=
1
;
}
...
...
@@ -262,7 +257,6 @@ public class AuditServiceImpl extends ServiceImpl<AuditMapper, Audit> implements
final
List
<
String
>
exhibitionBoardIdList
=
this
.
exhibitionBoardService
.
listObjs
(
queryWrapper
,
Object:
:
toString
);
if
(
exhibitionBoardIdList
!=
null
&&
!
exhibitionBoardIdList
.
isEmpty
())
{
this
.
exhibitionBoardService
.
removeByIds
(
exhibitionBoardIdList
);
this
.
auditMapper
.
delete
(
Wrappers
.<
Audit
>
lambdaUpdate
().
in
(
Audit:
:
getRefItemId
,
exhibitionBoardIdList
));
this
.
assetMapper
.
delete
(
Wrappers
.<
Asset
>
lambdaUpdate
().
in
(
Asset:
:
getRefItemId
,
exhibitionBoardIdList
));
final
LambdaQueryWrapper
<
LearningContentBoard
>
learningContentBoardLambdaQueryWrapper
=
Wrappers
.<
LearningContentBoard
>
lambdaQuery
().
in
(
LearningContentBoard:
:
getExhibitionBoardCatId
,
exhibitionBoardIdList
);
...
...
@@ -282,7 +276,6 @@ public class AuditServiceImpl extends ServiceImpl<AuditMapper, Audit> implements
this
.
learningContentBoardService
.
remove
(
deleteWrapper1
);
}
}
this
.
auditMapper
.
delete
(
Wrappers
.<
Audit
>
lambdaUpdate
().
in
(
Audit:
:
getRefItemId
,
videoContentId
));
this
.
assetMapper
.
delete
(
Wrappers
.<
Asset
>
lambdaUpdate
().
in
(
Asset:
:
getRefItemId
,
videoContentId
));
update
=
this
.
videoContentService
.
removeById
(
videoContentId
);
break
;
...
...
@@ -340,7 +333,6 @@ public class AuditServiceImpl extends ServiceImpl<AuditMapper, Audit> implements
LambdaUpdateWrapper
<
LearningContentBoard
>
learningContentBoardLambdaUpdateWrapper
=
Wrappers
.<
LearningContentBoard
>
lambdaUpdate
().
eq
(
LearningContentBoard:
:
getExhibitionBoardId
,
exhibitionBoardId
);
this
.
learningContentBoardService
.
remove
(
learningContentBoardLambdaUpdateWrapper
);
}
this
.
auditMapper
.
delete
(
Wrappers
.<
Audit
>
lambdaUpdate
().
eq
(
Audit:
:
getRefItemId
,
exhibitionBoardId
));
this
.
assetMapper
.
delete
(
Wrappers
.<
Asset
>
lambdaUpdate
().
eq
(
Asset:
:
getRefItemId
,
exhibitionBoardId
));
update
=
this
.
exhibitionBoardService
.
removeById
(
exhibitionBoardId
);
break
;
...
...
@@ -383,7 +375,6 @@ public class AuditServiceImpl extends ServiceImpl<AuditMapper, Audit> implements
update
=
this
.
learningContentService
.
updateById
(
learningContent
);
break
;
case
REMOVE:
this
.
auditMapper
.
delete
(
Wrappers
.<
Audit
>
lambdaUpdate
().
eq
(
Audit:
:
getRefItemId
,
learningContentId
));
this
.
learningContentBoardService
.
remove
(
Wrappers
.<
LearningContentBoard
>
lambdaUpdate
().
eq
(
LearningContentBoard:
:
getLearningContentId
,
learningContentId
));
this
.
learningContentBoardCatService
.
remove
(
Wrappers
.<
LearningContentBoardCat
>
lambdaUpdate
().
eq
(
LearningContentBoardCat:
:
getLearningContentId
,
learningContentId
));
this
.
learningContentCopyrightOwnerService
.
remove
(
Wrappers
.<
LearningContentCopyrightOwner
>
lambdaUpdate
().
eq
(
LearningContentCopyrightOwner:
:
getLearningContentId
,
learningContentId
));
...
...
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/AuditController.java
View file @
46ce6fd1
...
...
@@ -146,20 +146,6 @@ public class AuditController extends BaseController {
return
getFailResult
();
}
@DeleteMapping
(
"/delete/{id}"
)
@RequiresAuthentication
//@RequiresPermissions("/audit/delete")
@ApiOperation
(
value
=
"根据ID删除禁用审核"
,
notes
=
"根据ID删除禁用审核"
)
@ApiImplicitParams
(
value
=
{
@ApiImplicitParam
(
name
=
"id"
,
value
=
"标识ID"
,
paramType
=
"path"
,
dataType
=
"String"
)
})
public
Map
<
String
,
Object
>
deleteAudit
(
@PathVariable
(
"id"
)
String
id
)
{
boolean
result
=
auditService
.
removeById
(
id
);
if
(
result
)
{
return
getSuccessResult
();
}
return
getFailResult
();
}
// @GetMapping("/getList")
// @RequiresAuthentication //@RequiresPermissions("/audit/getList")
// @ApiOperation(value = "获取禁用审核全部列表(无分页)", notes = "获取禁用审核全部列表(无分页)")
...
...
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/CopyrightOwnerController.java
View file @
46ce6fd1
...
...
@@ -68,8 +68,6 @@ public class CopyrightOwnerController extends BaseController {
@Resource
private
LearningContentBoardCatService
learningContentBoardCatService
;
@Resource
private
AuditService
auditService
;
@Resource
private
AssetService
assetService
;
@PostMapping
(
"/save"
)
...
...
@@ -301,14 +299,12 @@ public class CopyrightOwnerController extends BaseController {
final
List
<
String
>
videoContentIdList
=
this
.
videoContentService
.
listObjs
(
videoContentLambdaQueryWrapper
,
Object:
:
toString
);
if
(
videoContentIdList
!=
null
&&
!
videoContentIdList
.
isEmpty
())
{
this
.
videoContentService
.
removeByIds
(
videoContentIdList
);
this
.
auditService
.
remove
(
Wrappers
.<
Audit
>
lambdaUpdate
().
in
(
Audit:
:
getRefItemId
,
videoContentIdList
));
this
.
assetService
.
remove
(
Wrappers
.<
Asset
>
lambdaUpdate
().
in
(
Asset:
:
getRefItemId
,
videoContentIdList
));
final
LambdaQueryWrapper
<
ExhibitionBoard
>
exhibitionBoardLambdaQueryWrapper
=
Wrappers
.<
ExhibitionBoard
>
lambdaQuery
().
in
(
ExhibitionBoard:
:
getVideoContentId
,
videoContentIdList
).
select
(
ExhibitionBoard:
:
getId
);
final
List
<
String
>
ExhibitionBoardIdList
=
this
.
exhibitionBoardService
.
listObjs
(
exhibitionBoardLambdaQueryWrapper
,
Object:
:
toString
);
if
(
ExhibitionBoardIdList
!=
null
&&
!
ExhibitionBoardIdList
.
isEmpty
())
{
this
.
exhibitionBoardService
.
removeByIds
(
ExhibitionBoardIdList
);
this
.
auditService
.
remove
(
Wrappers
.<
Audit
>
lambdaUpdate
().
in
(
Audit:
:
getRefItemId
,
ExhibitionBoardIdList
));
this
.
assetService
.
remove
(
Wrappers
.<
Asset
>
lambdaUpdate
().
in
(
Asset:
:
getRefItemId
,
ExhibitionBoardIdList
));
final
LambdaQueryWrapper
<
LearningContentBoard
>
learningContentBoardLambdaQueryWrapper
=
Wrappers
.<
LearningContentBoard
>
lambdaQuery
().
in
(
LearningContentBoard:
:
getExhibitionBoardCatId
,
ExhibitionBoardIdList
);
...
...
@@ -333,7 +329,6 @@ public class CopyrightOwnerController extends BaseController {
final
List
<
String
>
exhibitionBoardIdList
=
this
.
exhibitionBoardService
.
listObjs
(
exhibitionBoardLambdaQueryWrapper
,
Object:
:
toString
);
if
(
exhibitionBoardIdList
!=
null
&&
!
exhibitionBoardIdList
.
isEmpty
())
{
this
.
exhibitionBoardService
.
removeByIds
(
exhibitionBoardIdList
);
this
.
auditService
.
remove
(
Wrappers
.<
Audit
>
lambdaUpdate
().
in
(
Audit:
:
getRefItemId
,
exhibitionBoardIdList
));
this
.
assetService
.
remove
(
Wrappers
.<
Asset
>
lambdaUpdate
().
in
(
Asset:
:
getRefItemId
,
exhibitionBoardIdList
));
final
LambdaQueryWrapper
<
LearningContentBoard
>
learningContentBoardLambdaQueryWrapper
=
Wrappers
.<
LearningContentBoard
>
lambdaQuery
().
in
(
LearningContentBoard:
:
getExhibitionBoardCatId
,
exhibitionBoardIdList
);
...
...
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/ExhibitionBoardCatController.java
View file @
46ce6fd1
...
...
@@ -64,8 +64,6 @@ public class ExhibitionBoardCatController extends BaseController {
@Resource
private
LearningContentCopyrightOwnerService
learningContentCopyrightOwnerService
;
@Resource
private
AuditService
auditService
;
@Resource
private
AssetService
assetService
;
@PostMapping
(
"/save"
)
...
...
@@ -213,7 +211,6 @@ public class ExhibitionBoardCatController extends BaseController {
final
List
<
String
>
exhibitionBoardIdList
=
this
.
exhibitionBoardService
.
listObjs
(
exhibitionBoardLambdaQueryWrapper
,
Object:
:
toString
);
if
(
exhibitionBoardIdList
!=
null
&&
!
exhibitionBoardIdList
.
isEmpty
())
{
this
.
exhibitionBoardService
.
removeByIds
(
exhibitionBoardIdList
);
this
.
auditService
.
remove
(
Wrappers
.<
Audit
>
lambdaUpdate
().
in
(
Audit:
:
getRefItemId
,
exhibitionBoardIdList
));
this
.
assetService
.
remove
(
Wrappers
.<
Asset
>
lambdaUpdate
().
in
(
Asset:
:
getRefItemId
,
exhibitionBoardIdList
));
final
LambdaQueryWrapper
<
LearningContentBoard
>
learningContentBoardLambdaQueryWrapper
=
Wrappers
.<
LearningContentBoard
>
lambdaQuery
().
in
(
LearningContentBoard:
:
getExhibitionBoardCatId
,
exhibitionBoardIdList
);
...
...
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/VideoContentCatController.java
View file @
46ce6fd1
...
...
@@ -62,8 +62,6 @@ public class VideoContentCatController extends BaseController {
@Resource
private
LearningContentService
learningContentService
;
@Resource
private
AuditService
auditService
;
@Resource
private
AssetService
assetService
;
@PostMapping
(
value
=
"/save"
)
...
...
@@ -187,14 +185,12 @@ public class VideoContentCatController extends BaseController {
final
List
<
String
>
videoContentIdList
=
this
.
videoContentService
.
listObjs
(
lambdaQueryWrapper
,
Object:
:
toString
);
if
(
videoContentIdList
!=
null
&&
!
videoContentIdList
.
isEmpty
())
{
this
.
videoContentService
.
removeByIds
(
videoContentIdList
);
this
.
auditService
.
remove
(
Wrappers
.<
Audit
>
lambdaUpdate
().
in
(
Audit:
:
getRefItemId
,
videoContentIdList
));
this
.
assetService
.
remove
(
Wrappers
.<
Asset
>
lambdaUpdate
().
in
(
Asset:
:
getRefItemId
,
videoContentIdList
));
final
LambdaQueryWrapper
<
ExhibitionBoard
>
queryWrapper
=
Wrappers
.<
ExhibitionBoard
>
lambdaQuery
().
in
(
ExhibitionBoard:
:
getVideoContentId
,
videoContentIdList
).
select
(
ExhibitionBoard:
:
getId
);
final
List
<
String
>
exhibitionBoardIdList
=
this
.
exhibitionBoardService
.
listObjs
(
queryWrapper
,
Object:
:
toString
);
if
(
exhibitionBoardIdList
!=
null
&&
!
exhibitionBoardIdList
.
isEmpty
())
{
this
.
exhibitionBoardService
.
removeByIds
(
exhibitionBoardIdList
);
this
.
auditService
.
remove
(
Wrappers
.<
Audit
>
lambdaUpdate
().
in
(
Audit:
:
getRefItemId
,
exhibitionBoardIdList
));
this
.
assetService
.
remove
(
Wrappers
.<
Asset
>
lambdaUpdate
().
in
(
Asset:
:
getRefItemId
,
exhibitionBoardIdList
));
final
LambdaQueryWrapper
<
LearningContentBoard
>
learningContentBoardLambdaQueryWrapper
=
Wrappers
.<
LearningContentBoard
>
lambdaQuery
().
in
(
LearningContentBoard:
:
getExhibitionBoardCatId
,
exhibitionBoardIdList
);
...
...
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