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
7f0fa1c5
Commit
7f0fa1c5
authored
Mar 28, 2021
by
liqin
💬
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug fixed
parent
62e702ba
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
9 deletions
+8
-9
FastDFSUtils.java
...cn/wisenergy/chnmuseum/party/common/dfs/FastDFSUtils.java
+0
-1
MetaObjectHandlerConfig.java
...nmuseum/party/common/mybatis/MetaObjectHandlerConfig.java
+6
-6
AssetController.java
...nergy/chnmuseum/party/web/controller/AssetController.java
+2
-2
No files found.
src/main/java/cn/wisenergy/chnmuseum/party/common/dfs/FastDFSUtils.java
View file @
7f0fa1c5
...
...
@@ -88,7 +88,6 @@ public class FastDFSUtils {
final
Set
<
MetaData
>
metaDataSet
=
new
HashSet
<>();
metaDataSet
.
add
(
new
MetaData
(
"fileName"
,
fileName
));
metaDataSet
.
add
(
new
MetaData
(
"fileSize"
,
size
+
""
));
metaDataSet
.
add
(
new
MetaData
(
"fileExtName"
,
FilenameUtils
.
getExtension
(
fileName
)));
metaDataSet
.
add
(
new
MetaData
(
"updateTime"
,
TimeUtils
.
format
(
LocalDateTime
.
now
(),
TimeUtils
.
FORMAT_ONE
)));
metaDataSet
.
add
(
new
MetaData
(
"MD5"
,
md5
));
final
StorePath
storePath
=
storageClient
.
uploadFile
(
is
,
size
,
FilenameUtils
.
getExtension
(
fileName
),
metaDataSet
);
...
...
src/main/java/cn/wisenergy/chnmuseum/party/common/mybatis/MetaObjectHandlerConfig.java
View file @
7f0fa1c5
...
...
@@ -17,13 +17,13 @@ public class MetaObjectHandlerConfig implements MetaObjectHandler {
@Override
public
void
insertFill
(
MetaObject
metaObject
)
{
LocalDateTime
now
=
LocalDateTime
.
now
();
Object
createTime
=
getFieldValByName
(
"create
_t
ime"
,
metaObject
);
Object
updateTime
=
getFieldValByName
(
"update
_t
ime"
,
metaObject
);
Object
createTime
=
getFieldValByName
(
"create
T
ime"
,
metaObject
);
Object
updateTime
=
getFieldValByName
(
"update
T
ime"
,
metaObject
);
if
(
createTime
==
null
)
{
this
.
setFieldValByName
(
"create
_t
ime"
,
now
,
metaObject
);
this
.
setFieldValByName
(
"create
T
ime"
,
now
,
metaObject
);
}
if
(
updateTime
==
null
)
{
this
.
setFieldValByName
(
"update
_t
ime"
,
now
,
metaObject
);
this
.
setFieldValByName
(
"update
T
ime"
,
now
,
metaObject
);
}
this
.
setFieldValByName
(
"version"
,
1
,
metaObject
);
// 创建人
...
...
@@ -35,9 +35,9 @@ public class MetaObjectHandlerConfig implements MetaObjectHandler {
@Override
public
void
updateFill
(
MetaObject
metaObject
)
{
LocalDateTime
now
=
LocalDateTime
.
now
();
Object
updateTime
=
getFieldValByName
(
"update
_t
ime"
,
metaObject
);
Object
updateTime
=
getFieldValByName
(
"update
T
ime"
,
metaObject
);
if
(
updateTime
==
null
)
{
this
.
setFieldValByName
(
"update
_t
ime"
,
now
,
metaObject
);
this
.
setFieldValByName
(
"update
T
ime"
,
now
,
metaObject
);
}
//操作人
// this.setFieldValByName("createId", 111L, metaObject);
...
...
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/AssetController.java
View file @
7f0fa1c5
...
...
@@ -25,6 +25,7 @@ import io.swagger.annotations.ApiImplicitParam;
import
io.swagger.annotations.ApiImplicitParams
;
import
io.swagger.annotations.ApiOperation
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.commons.io.FilenameUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.shiro.authz.annotation.RequiresPermissions
;
import
org.springframework.validation.annotation.Validated
;
...
...
@@ -71,7 +72,7 @@ public class AssetController extends BaseController {
final
Set
<
MetaData
>
metaData
=
FastDFSUtils
.
getFileMetaData
(
videoUrl
);
String
fileName
=
metaData
.
stream
().
filter
(
x
->
"fileName"
.
equals
(
x
.
getName
())).
map
(
MetaData:
:
getValue
).
findFirst
().
get
();
Long
fileSize
=
metaData
.
stream
().
filter
(
x
->
"fileSize"
.
equals
(
x
.
getName
())).
map
(
MetaData:
:
getValue
).
map
(
Long:
:
parseLong
).
findFirst
().
get
();
String
fileExtName
=
metaData
.
stream
().
filter
(
x
->
"fileExtName"
.
equals
(
x
.
getName
())).
map
(
MetaData:
:
getValue
).
findFirst
().
get
(
);
String
fileExtName
=
FilenameUtils
.
getExtension
(
fileName
);
String
updateTime
=
metaData
.
stream
().
filter
(
x
->
"updateTime"
.
equals
(
x
.
getName
())).
map
(
MetaData:
:
getValue
).
findFirst
().
get
();
String
md5
=
metaData
.
stream
().
filter
(
x
->
"MD5"
.
equals
(
x
.
getName
())).
map
(
MetaData:
:
getValue
).
findFirst
().
get
();
filesMetadata
.
add
(
VideoVo
.
builder
()
...
...
@@ -90,7 +91,6 @@ public class AssetController extends BaseController {
boolean
result
=
assetService
.
save
(
asset
);
// 返回操作结果
if
(
result
)
{
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