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
f5377f7c
Commit
f5377f7c
authored
Mar 31, 2021
by
wzp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
4ae472f5
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
7 deletions
+12
-7
MvcConfiguration.java
...a/cn/wisenergy/chnmuseum/party/conf/MvcConfiguration.java
+1
-1
AuditController.java
...nergy/chnmuseum/party/web/controller/AuditController.java
+11
-6
No files found.
src/main/java/cn/wisenergy/chnmuseum/party/conf/MvcConfiguration.java
View file @
f5377f7c
...
@@ -81,7 +81,7 @@ public class MvcConfiguration extends WebMvcConfigurationSupport {
...
@@ -81,7 +81,7 @@ public class MvcConfiguration extends WebMvcConfigurationSupport {
// serializeConfig.put(Long.class, ToStringSerializer.instance);
// serializeConfig.put(Long.class, ToStringSerializer.instance);
// serializeConfig.put(Long.TYPE, ToStringSerializer.instance);
// serializeConfig.put(Long.TYPE, ToStringSerializer.instance);
serializeConfig
.
setPropertyNamingStrategy
(
PropertyNamingStrategy
.
CamelCase
);
serializeConfig
.
setPropertyNamingStrategy
(
PropertyNamingStrategy
.
CamelCase
);
serializeConfig
.
put
(
LocalDateTime
.
class
,
new
MyLocalDateTimeSerializer
(
"yyyy-MM-dd
hh
:mm:ss"
));
serializeConfig
.
put
(
LocalDateTime
.
class
,
new
MyLocalDateTimeSerializer
(
"yyyy-MM-dd
HH
:mm:ss"
));
serializeConfig
.
put
(
LocalDate
.
class
,
new
MyLocalDateSerializer
(
"yyyy-MM-dd"
));
serializeConfig
.
put
(
LocalDate
.
class
,
new
MyLocalDateSerializer
(
"yyyy-MM-dd"
));
fastJsonConfig
.
setSerializeConfig
(
serializeConfig
);
fastJsonConfig
.
setSerializeConfig
(
serializeConfig
);
...
...
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/AuditController.java
View file @
f5377f7c
...
@@ -195,17 +195,22 @@ public class AuditController extends BaseController {
...
@@ -195,17 +195,22 @@ public class AuditController extends BaseController {
@ApiOperation
(
value
=
"获取禁用审核详情"
,
notes
=
"获取禁用审核详情"
)
@ApiOperation
(
value
=
"获取禁用审核详情"
,
notes
=
"获取禁用审核详情"
)
@GetMapping
(
"/getById"
)
@GetMapping
(
"/getById"
)
@RequiresPermissions
(
"/audit/getById"
)
@RequiresPermissions
(
"/audit/getById"
)
public
Map
<
String
,
Object
>
getById
(
String
id
)
{
public
Map
<
String
,
Object
>
getById
(
String
id
,
String
type
)
{
HashMap
<
String
,
Object
>
resultMap
=
new
HashMap
<>();
HashMap
<
String
,
Object
>
resultMap
=
new
HashMap
<>();
try
{
try
{
Audit
audit
=
n
ew
Audit
()
;
Audit
audit
=
n
ull
;
UpdateWrapper
<
Audit
>
wrapper
=
new
UpdateWrapper
<>();
UpdateWrapper
<
Audit
>
wrapper
=
new
UpdateWrapper
<>();
wrapper
.
eq
(
"ref_item_id"
,
id
);
if
(
StringUtils
.
isNotBlank
(
id
))
{
wrapper
.
eq
(
"ref_item_id"
,
id
);
}
if
(
StringUtils
.
isNotBlank
(
type
))
{
wrapper
.
eq
(
"type"
,
type
);
}
wrapper
.
orderByDesc
(
"create_time"
);
wrapper
.
orderByDesc
(
"create_time"
);
//只获取最新的一条审核数据
//只获取最新的一条审核数据
List
<
Audit
>
list
=
auditService
.
list
(
wrapper
);
List
<
Audit
>
list
=
auditService
.
list
(
wrapper
);
if
(
list
.
size
()
>
0
)
{
if
(
list
.
size
()
>
0
)
{
audit
=
list
.
get
(
0
);
audit
=
list
.
get
(
0
);
}
}
resultMap
.
put
(
"resultCode"
,
"200"
);
resultMap
.
put
(
"resultCode"
,
"200"
);
resultMap
.
put
(
"message"
,
"操作成功"
);
resultMap
.
put
(
"message"
,
"操作成功"
);
...
@@ -231,7 +236,7 @@ public class AuditController extends BaseController {
...
@@ -231,7 +236,7 @@ public class AuditController extends BaseController {
@ApiImplicitParam
(
name
=
"type"
,
value
=
"视频内容 ASSET,展板内容 EXHIBITION_BOARD,学习内容 LEARNING_CONTENT"
,
paramType
=
"query"
,
dataType
=
"String"
,
required
=
true
)
@ApiImplicitParam
(
name
=
"type"
,
value
=
"视频内容 ASSET,展板内容 EXHIBITION_BOARD,学习内容 LEARNING_CONTENT"
,
paramType
=
"query"
,
dataType
=
"String"
,
required
=
true
)
})
})
public
Map
<
String
,
Object
>
getPageAllList
(
String
name
,
String
status
,
public
Map
<
String
,
Object
>
getPageAllList
(
String
name
,
String
status
,
@NotBlank
(
message
=
"type参数不能为空"
)
String
type
)
{
@NotBlank
(
message
=
"type参数不能为空"
)
String
type
)
{
Page
<
Object
>
page
=
getPage
();
Page
<
Object
>
page
=
getPage
();
AuditStatusEnum
auditStatusEnum
=
null
;
AuditStatusEnum
auditStatusEnum
=
null
;
...
...
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