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
ee88a2c6
Commit
ee88a2c6
authored
Jun 24, 2021
by
nie'hong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改-中移接口学习内容-展板界面展板缩略图可为空
parent
643f5cdb
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
4 deletions
+7
-4
AssetController.java
...va/cn/chnmuseum/party/web/controller/AssetController.java
+1
-1
ChinaMobileRestApiController.java
...um/party/web/controller/ChinaMobileRestApiController.java
+3
-1
CopyrightOwnerController.java
...museum/party/web/controller/CopyrightOwnerController.java
+3
-2
No files found.
src/main/java/cn/chnmuseum/party/web/controller/AssetController.java
View file @
ee88a2c6
...
@@ -145,7 +145,7 @@ public class AssetController extends BaseController {
...
@@ -145,7 +145,7 @@ public class AssetController extends BaseController {
for
(
Asset
asset
:
assetList
)
{
for
(
Asset
asset
:
assetList
)
{
ByteArrayOutputStream
byteOutputStream
=
new
ByteArrayOutputStream
();
ByteArrayOutputStream
byteOutputStream
=
new
ByteArrayOutputStream
();
FastDFSUtils
.
downloadFile
(
asset
.
getFileUrlCrypto
(),
byteOutputStream
);
FastDFSUtils
.
downloadFile
(
asset
.
getFileUrlCrypto
(),
byteOutputStream
);
map
.
put
(
asset
.
get
FileNameCrypto
(),
new
ByteArrayInputStream
(
byteOutputStream
.
toByteArray
()));
map
.
put
(
asset
.
get
Id
(),
new
ByteArrayInputStream
(
byteOutputStream
.
toByteArray
()));
}
}
ZipUtil
.
zip
(
response
.
getOutputStream
(),
map
.
keySet
().
toArray
(
new
String
[
0
]),
map
.
values
().
toArray
(
new
InputStream
[
0
]));
ZipUtil
.
zip
(
response
.
getOutputStream
(),
map
.
keySet
().
toArray
(
new
String
[
0
]),
map
.
values
().
toArray
(
new
InputStream
[
0
]));
}
}
...
...
src/main/java/cn/chnmuseum/party/web/controller/ChinaMobileRestApiController.java
View file @
ee88a2c6
...
@@ -510,7 +510,9 @@ public class ChinaMobileRestApiController extends BaseController {
...
@@ -510,7 +510,9 @@ public class ChinaMobileRestApiController extends BaseController {
String
name
=
this
.
copyrightOwnerService
.
getById
(
exhibitionBoard
.
getVideoContentCopyrightOwnerId
()).
getName
();
String
name
=
this
.
copyrightOwnerService
.
getById
(
exhibitionBoard
.
getVideoContentCopyrightOwnerId
()).
getName
();
exhibitionBoard
.
setBoardCopyrightOwnerName
(
name
);
exhibitionBoard
.
setBoardCopyrightOwnerName
(
name
);
}
}
if
(
StringUtils
.
isEmpty
(
exhibitionBoard
.
getCover
()))
{
exhibitionBoard
.
setCover
(
""
);
}
LambdaQueryWrapper
<
Asset
>
assetQueryWrapper
;
LambdaQueryWrapper
<
Asset
>
assetQueryWrapper
;
if
(
StringUtils
.
isNotEmpty
(
exhibitionBoard
.
getVideoContentId
()))
{
if
(
StringUtils
.
isNotEmpty
(
exhibitionBoard
.
getVideoContentId
()))
{
final
VideoContent
videoContent
=
this
.
videoContentService
.
getById
(
exhibitionBoard
.
getVideoContentId
());
final
VideoContent
videoContent
=
this
.
videoContentService
.
getById
(
exhibitionBoard
.
getVideoContentId
());
...
...
src/main/java/cn/chnmuseum/party/web/controller/CopyrightOwnerController.java
View file @
ee88a2c6
...
@@ -23,6 +23,7 @@ import io.swagger.annotations.ApiOperation;
...
@@ -23,6 +23,7 @@ import io.swagger.annotations.ApiOperation;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.shiro.authz.annotation.RequiresAuthentication
;
import
org.apache.shiro.authz.annotation.RequiresAuthentication
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.validation.annotation.Validated
;
import
org.springframework.validation.annotation.Validated
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.*
;
...
@@ -324,12 +325,12 @@ public class CopyrightOwnerController extends BaseController {
...
@@ -324,12 +325,12 @@ public class CopyrightOwnerController extends BaseController {
@ApiImplicitParam
(
name
=
"id"
,
value
=
"标识ID"
,
paramType
=
"path"
,
dataType
=
"String"
)
@ApiImplicitParam
(
name
=
"id"
,
value
=
"标识ID"
,
paramType
=
"path"
,
dataType
=
"String"
)
})
})
@MethodLog
(
operModule
=
OperModule
.
DISPLAYCOPYRIGHT
,
operType
=
OperType
.
DELETE
)
@MethodLog
(
operModule
=
OperModule
.
DISPLAYCOPYRIGHT
,
operType
=
OperType
.
DELETE
)
@Transactional
public
Map
<
String
,
Object
>
deleteCopyrightOwner
(
@PathVariable
(
"id"
)
String
id
)
{
public
Map
<
String
,
Object
>
deleteCopyrightOwner
(
@PathVariable
(
"id"
)
String
id
)
{
// 版权方有对应展板信息,则不能被删除
// 版权方有对应展板信息,则不能被删除
LambdaQueryWrapper
<
ExhibitionBoard
>
exhibitionBoardLambdaQueryWrapper1
=
new
LambdaQueryWrapper
<>();
LambdaQueryWrapper
<
ExhibitionBoard
>
exhibitionBoardLambdaQueryWrapper1
=
new
LambdaQueryWrapper
<>();
exhibitionBoardLambdaQueryWrapper1
.
eq
(
ExhibitionBoard:
:
getBoardCopyrightOwnerId
,
id
);
exhibitionBoardLambdaQueryWrapper1
.
eq
(
ExhibitionBoard:
:
getBoardCopyrightOwnerId
,
id
);
exhibitionBoardLambdaQueryWrapper1
.
eq
(
ExhibitionBoard:
:
getDeleted
,
false
);
List
<
ExhibitionBoard
>
list
=
this
.
exhibitionBoardService
.
list
(
exhibitionBoardLambdaQueryWrapper1
);
List
<
ExhibitionBoard
>
list
=
this
.
exhibitionBoardService
.
list
();
if
(
CollectionUtil
.
isNotEmpty
(
list
))
{
if
(
CollectionUtil
.
isNotEmpty
(
list
))
{
return
getFailResult
(
"该版权方有关联展板信息,无法删除"
);
return
getFailResult
(
"该版权方有关联展板信息,无法删除"
);
}
}
...
...
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