Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
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
e3190d5d
Commit
e3190d5d
authored
Apr 13, 2021
by
liqin
💬
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug fixed
parent
608302c3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
34 additions
and
20 deletions
+34
-20
pom.xml
pom.xml
+3
-3
ExhibitionBoardCatController.java
...um/party/web/controller/ExhibitionBoardCatController.java
+13
-1
VideoContentCatController.java
...useum/party/web/controller/VideoContentCatController.java
+18
-16
No files found.
pom.xml
View file @
e3190d5d
...
@@ -182,13 +182,13 @@
...
@@ -182,13 +182,13 @@
<dependency>
<dependency>
<groupId>
com.google.guava
</groupId>
<groupId>
com.google.guava
</groupId>
<artifactId>
guava
</artifactId>
<artifactId>
guava
</artifactId>
<version>
29.0
-jre
</version>
<version>
30.1.1
-jre
</version>
</dependency>
</dependency>
<!-- JWT Authentication -->
<!-- JWT Authentication -->
<dependency>
<dependency>
<groupId>
com.auth0
</groupId>
<groupId>
com.auth0
</groupId>
<artifactId>
java-jwt
</artifactId>
<artifactId>
java-jwt
</artifactId>
<version>
3.1
4
.0
</version>
<version>
3.1
5
.0
</version>
</dependency>
</dependency>
<!-- Shiro Authentication And Authorization -->
<!-- Shiro Authentication And Authorization -->
<dependency>
<dependency>
...
@@ -257,7 +257,7 @@
...
@@ -257,7 +257,7 @@
<dependency>
<dependency>
<groupId>
cn.hutool
</groupId>
<groupId>
cn.hutool
</groupId>
<artifactId>
hutool-all
</artifactId>
<artifactId>
hutool-all
</artifactId>
<version>
5.6.
2
</version>
<version>
5.6.
3
</version>
</dependency>
</dependency>
<dependency>
<dependency>
<groupId>
org.projectlombok
</groupId>
<groupId>
org.projectlombok
</groupId>
...
...
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/ExhibitionBoardCatController.java
View file @
e3190d5d
...
@@ -116,7 +116,19 @@ public class ExhibitionBoardCatController extends BaseController {
...
@@ -116,7 +116,19 @@ public class ExhibitionBoardCatController extends BaseController {
this
.
exhibitionBoardService
.
update
(
updateWrapper
);
this
.
exhibitionBoardService
.
update
(
updateWrapper
);
//todo 删除中间关联表
//todo 删除中间关联表
// final LambdaUpdateWrapper<VideoContent> updateWrapper = Wrappers.<VideoContent>lambdaUpdate().eq(VideoContent::getVideoContentCopyrightOwnerId, id);
// updateWrapper.set(VideoContent::getDeleted, true);
// this.videoContentService.update(updateWrapper);
//
// final LambdaUpdateWrapper<ExhibitionBoard> updateWrapper1 = Wrappers.<ExhibitionBoard>lambdaUpdate().eq(ExhibitionBoard::getBoardCopyrightOwnerId, id);
// updateWrapper1.set(ExhibitionBoard::getDeleted, true);
// this.exhibitionBoardService.update(updateWrapper1);
//
// LambdaUpdateWrapper<CopyrightOwnerBoardCat> deleteWrapper = Wrappers.<CopyrightOwnerBoardCat>lambdaUpdate().eq(CopyrightOwnerBoardCat::getCopyrightOwnerId, id);
// this.copyrightOwnerBoardCatService.remove(deleteWrapper);
//
// LambdaUpdateWrapper<CopyrightOwnerVideoContentCat> deleteWrapper1 = Wrappers.<CopyrightOwnerVideoContentCat>lambdaUpdate().eq(CopyrightOwnerVideoContentCat::getCopyrightOwnerId, id);
// this.copyrightOwnerVideoContentCatService.remove(deleteWrapper1);
return
getSuccessResult
();
return
getSuccessResult
();
}
}
...
...
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/VideoContentCatController.java
View file @
e3190d5d
...
@@ -2,7 +2,10 @@ package cn.wisenergy.chnmuseum.party.web.controller;
...
@@ -2,7 +2,10 @@ package cn.wisenergy.chnmuseum.party.web.controller;
import
cn.wisenergy.chnmuseum.party.common.validator.groups.Add
;
import
cn.wisenergy.chnmuseum.party.common.validator.groups.Add
;
import
cn.wisenergy.chnmuseum.party.common.vo.GenericPageParam
;
import
cn.wisenergy.chnmuseum.party.common.vo.GenericPageParam
;
import
cn.wisenergy.chnmuseum.party.model.*
;
import
cn.wisenergy.chnmuseum.party.model.CopyrightOwner
;
import
cn.wisenergy.chnmuseum.party.model.CopyrightOwnerVideoContentCat
;
import
cn.wisenergy.chnmuseum.party.model.VideoContent
;
import
cn.wisenergy.chnmuseum.party.model.VideoContentCat
;
import
cn.wisenergy.chnmuseum.party.service.*
;
import
cn.wisenergy.chnmuseum.party.service.*
;
import
cn.wisenergy.chnmuseum.party.web.controller.base.BaseController
;
import
cn.wisenergy.chnmuseum.party.web.controller.base.BaseController
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
...
@@ -172,21 +175,20 @@ public class VideoContentCatController extends BaseController {
...
@@ -172,21 +175,20 @@ public class VideoContentCatController extends BaseController {
final
LambdaUpdateWrapper
<
CopyrightOwnerVideoContentCat
>
updateWrapper1
=
Wrappers
.<
CopyrightOwnerVideoContentCat
>
lambdaUpdate
().
eq
(
CopyrightOwnerVideoContentCat:
:
getVideoContentCatId
,
id
);
final
LambdaUpdateWrapper
<
CopyrightOwnerVideoContentCat
>
updateWrapper1
=
Wrappers
.<
CopyrightOwnerVideoContentCat
>
lambdaUpdate
().
eq
(
CopyrightOwnerVideoContentCat:
:
getVideoContentCatId
,
id
);
this
.
copyrightOwnerVideoContentCatService
.
remove
(
updateWrapper1
);
this
.
copyrightOwnerVideoContentCatService
.
remove
(
updateWrapper1
);
// final LambdaQueryWrapper<CopyrightOwnerVideoContentCat> eq = Wrappers.<CopyrightOwnerVideoContentCat>lambdaQuery().eq(CopyrightOwnerVideoContentCat::getVideoContentCatId, id);
final
LambdaQueryWrapper
<
CopyrightOwnerVideoContentCat
>
eq
=
Wrappers
.<
CopyrightOwnerVideoContentCat
>
lambdaQuery
().
eq
(
CopyrightOwnerVideoContentCat:
:
getVideoContentCatId
,
id
);
// final List<CopyrightOwnerVideoContentCat> list = this.copyrightOwnerVideoContentCatService.list(eq);
final
List
<
CopyrightOwnerVideoContentCat
>
list
=
this
.
copyrightOwnerVideoContentCatService
.
list
(
eq
);
// final List<String> collect = list.stream().map(CopyrightOwnerVideoContentCat::getCopyrightOwnerId).distinct().collect(Collectors.toList());
final
List
<
String
>
collect
=
list
.
stream
().
map
(
CopyrightOwnerVideoContentCat:
:
getCopyrightOwnerId
).
distinct
().
collect
(
Collectors
.
toList
());
//
// final LambdaUpdateWrapper<VideoContent> updateWrapper2 = Wrappers.<VideoContent>lambdaUpdate().in(VideoContent::getVideoContentCopyrightOwnerId, collect);
final
LambdaUpdateWrapper
<
VideoContent
>
updateWrapper2
=
Wrappers
.<
VideoContent
>
lambdaUpdate
().
in
(
VideoContent:
:
getVideoContentCopyrightOwnerId
,
collect
);
// updateWrapper2.set(VideoContent::getDeleted, true);
updateWrapper2
.
set
(
VideoContent:
:
getDeleted
,
true
);
// this.videoContentService.update(updateWrapper2);
this
.
videoContentService
.
update
(
updateWrapper2
);
//
// final LambdaUpdateWrapper<ExhibitionBoard> updateWrapper3 = Wrappers.<ExhibitionBoard>lambdaUpdate().in(ExhibitionBoard::getBoardCopyrightOwnerId, collect);
final
LambdaUpdateWrapper
<
ExhibitionBoard
>
updateWrapper3
=
Wrappers
.<
ExhibitionBoard
>
lambdaUpdate
().
in
(
ExhibitionBoard:
:
getBoardCopyrightOwnerId
,
collect
);
// updateWrapper3.set(ExhibitionBoard::getDeleted, true);
updateWrapper3
.
set
(
ExhibitionBoard:
:
getDeleted
,
true
);
// this.exhibitionBoardService.update(updateWrapper3);
this
.
exhibitionBoardService
.
update
(
updateWrapper3
);
//
// LambdaUpdateWrapper<CopyrightOwnerBoardCat> deleteWrapper = Wrappers.<CopyrightOwnerBoardCat>lambdaUpdate().in(CopyrightOwnerBoardCat::getCopyrightOwnerId, collect);
LambdaUpdateWrapper
<
CopyrightOwnerBoardCat
>
deleteWrapper
=
Wrappers
.<
CopyrightOwnerBoardCat
>
lambdaUpdate
().
in
(
CopyrightOwnerBoardCat:
:
getCopyrightOwnerId
,
collect
);
// this.copyrightOwnerBoardCatService.remove(deleteWrapper);
this
.
copyrightOwnerBoardCatService
.
remove
(
deleteWrapper
);
return
getSuccessResult
();
return
getSuccessResult
();
}
}
...
...
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