Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
zhangjian1949
SpringBlade
提交
72ffd928
S
SpringBlade
项目概览
zhangjian1949
/
SpringBlade
通知
6
Star
0
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
SpringBlade
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
72ffd928
编写于
8月 27, 2020
作者:
S
smallchill
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
🎉
优化log模块分页排序
上级
70f59b99
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
11 addition
and
2 deletion
+11
-2
blade-service/blade-log/src/main/java/org/springblade/core/log/controller/LogApiController.java
...org/springblade/core/log/controller/LogApiController.java
+4
-1
blade-service/blade-log/src/main/java/org/springblade/core/log/controller/LogErrorController.java
...g/springblade/core/log/controller/LogErrorController.java
+4
-1
blade-service/blade-log/src/main/java/org/springblade/core/log/controller/LogUsualController.java
...g/springblade/core/log/controller/LogUsualController.java
+3
-0
未找到文件。
blade-service/blade-log/src/main/java/org/springblade/core/log/controller/LogApiController.java
浏览文件 @
72ffd928
...
...
@@ -27,6 +27,7 @@ import org.springblade.core.mp.support.Query;
import
org.springblade.core.tool.api.R
;
import
org.springblade.core.tool.utils.BeanUtil
;
import
org.springblade.core.tool.utils.Func
;
import
org.springblade.core.tool.utils.StringPool
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestParam
;
...
...
@@ -63,7 +64,9 @@ public class LogApiController {
*/
@GetMapping
(
"/list"
)
public
R
<
IPage
<
LogApiVo
>>
list
(
@ApiIgnore
@RequestParam
Map
<
String
,
Object
>
log
,
Query
query
)
{
IPage
<
LogApi
>
pages
=
logService
.
page
(
Condition
.
getPage
(
query
.
setDescs
(
"create_time"
)),
Condition
.
getQueryWrapper
(
log
,
LogApi
.
class
));
query
.
setAscs
(
"create_time"
);
query
.
setDescs
(
StringPool
.
EMPTY
);
IPage
<
LogApi
>
pages
=
logService
.
page
(
Condition
.
getPage
(
query
),
Condition
.
getQueryWrapper
(
log
,
LogApi
.
class
));
List
<
LogApiVo
>
records
=
pages
.
getRecords
().
stream
().
map
(
logApi
->
{
LogApiVo
vo
=
BeanUtil
.
copy
(
logApi
,
LogApiVo
.
class
);
vo
.
setStrId
(
Func
.
toStr
(
logApi
.
getId
()));
...
...
blade-service/blade-log/src/main/java/org/springblade/core/log/controller/LogErrorController.java
浏览文件 @
72ffd928
...
...
@@ -27,6 +27,7 @@ import org.springblade.core.mp.support.Query;
import
org.springblade.core.tool.api.R
;
import
org.springblade.core.tool.utils.BeanUtil
;
import
org.springblade.core.tool.utils.Func
;
import
org.springblade.core.tool.utils.StringPool
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestParam
;
...
...
@@ -63,7 +64,9 @@ public class LogErrorController {
*/
@GetMapping
(
"/list"
)
public
R
<
IPage
<
LogErrorVo
>>
list
(
@ApiIgnore
@RequestParam
Map
<
String
,
Object
>
logError
,
Query
query
)
{
IPage
<
LogError
>
pages
=
errorLogService
.
page
(
Condition
.
getPage
(
query
.
setDescs
(
"create_time"
)),
Condition
.
getQueryWrapper
(
logError
,
LogError
.
class
));
query
.
setAscs
(
"create_time"
);
query
.
setDescs
(
StringPool
.
EMPTY
);
IPage
<
LogError
>
pages
=
errorLogService
.
page
(
Condition
.
getPage
(
query
),
Condition
.
getQueryWrapper
(
logError
,
LogError
.
class
));
List
<
LogErrorVo
>
records
=
pages
.
getRecords
().
stream
().
map
(
logApi
->
{
LogErrorVo
vo
=
BeanUtil
.
copy
(
logApi
,
LogErrorVo
.
class
);
vo
.
setStrId
(
Func
.
toStr
(
logApi
.
getId
()));
...
...
blade-service/blade-log/src/main/java/org/springblade/core/log/controller/LogUsualController.java
浏览文件 @
72ffd928
...
...
@@ -27,6 +27,7 @@ import org.springblade.core.mp.support.Query;
import
org.springblade.core.tool.api.R
;
import
org.springblade.core.tool.utils.BeanUtil
;
import
org.springblade.core.tool.utils.Func
;
import
org.springblade.core.tool.utils.StringPool
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestParam
;
...
...
@@ -63,6 +64,8 @@ public class LogUsualController {
*/
@GetMapping
(
"/list"
)
public
R
<
IPage
<
LogUsualVo
>>
list
(
@ApiIgnore
@RequestParam
Map
<
String
,
Object
>
log
,
Query
query
)
{
query
.
setAscs
(
"create_time"
);
query
.
setDescs
(
StringPool
.
EMPTY
);
IPage
<
LogUsual
>
pages
=
logService
.
page
(
Condition
.
getPage
(
query
),
Condition
.
getQueryWrapper
(
log
,
LogUsual
.
class
));
List
<
LogUsualVo
>
records
=
pages
.
getRecords
().
stream
().
map
(
logApi
->
{
LogUsualVo
vo
=
BeanUtil
.
copy
(
logApi
,
LogUsualVo
.
class
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录