Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
guns-vip
Overview
Overview
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
chenjunxiong
guns-vip
Commits
27c5d308
Commit
27c5d308
authored
Jun 29, 2018
by
fengshuonan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复一处类的标识错误
parent
d2912c09
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
9 deletions
+8
-9
guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/LoginLogController.java
+3
-3
guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/LoginLogMapper.java
+3
-2
guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ILoginLogService.java
+1
-2
guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/LoginLogServiceImpl.java
+1
-2
No files found.
guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/LoginLogController.java
View file @
27c5d308
...
@@ -7,7 +7,7 @@ import com.stylefeng.guns.core.common.annotion.BussinessLog;
...
@@ -7,7 +7,7 @@ import com.stylefeng.guns.core.common.annotion.BussinessLog;
import
com.stylefeng.guns.core.common.annotion.Permission
;
import
com.stylefeng.guns.core.common.annotion.Permission
;
import
com.stylefeng.guns.core.common.constant.Const
;
import
com.stylefeng.guns.core.common.constant.Const
;
import
com.stylefeng.guns.core.common.constant.factory.PageFactory
;
import
com.stylefeng.guns.core.common.constant.factory.PageFactory
;
import
com.stylefeng.guns.modular.system.model.
Operatio
nLog
;
import
com.stylefeng.guns.modular.system.model.
Logi
nLog
;
import
com.stylefeng.guns.modular.system.service.ILoginLogService
;
import
com.stylefeng.guns.modular.system.service.ILoginLogService
;
import
com.stylefeng.guns.modular.system.warpper.LogWarpper
;
import
com.stylefeng.guns.modular.system.warpper.LogWarpper
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
@@ -49,9 +49,9 @@ public class LoginLogController extends BaseController {
...
@@ -49,9 +49,9 @@ public class LoginLogController extends BaseController {
@Permission
(
Const
.
ADMIN_NAME
)
@Permission
(
Const
.
ADMIN_NAME
)
@ResponseBody
@ResponseBody
public
Object
list
(
@RequestParam
(
required
=
false
)
String
beginTime
,
@RequestParam
(
required
=
false
)
String
endTime
,
@RequestParam
(
required
=
false
)
String
logName
)
{
public
Object
list
(
@RequestParam
(
required
=
false
)
String
beginTime
,
@RequestParam
(
required
=
false
)
String
endTime
,
@RequestParam
(
required
=
false
)
String
logName
)
{
Page
<
OperationLog
>
page
=
new
PageFactory
<
Operatio
nLog
>().
defaultPage
();
Page
<
LoginLog
>
page
=
new
PageFactory
<
Logi
nLog
>().
defaultPage
();
List
<
Map
<
String
,
Object
>>
result
=
loginLogService
.
getLoginLogs
(
page
,
beginTime
,
endTime
,
logName
,
page
.
getOrderByField
(),
page
.
isAsc
());
List
<
Map
<
String
,
Object
>>
result
=
loginLogService
.
getLoginLogs
(
page
,
beginTime
,
endTime
,
logName
,
page
.
getOrderByField
(),
page
.
isAsc
());
page
.
setRecords
((
List
<
Operatio
nLog
>)
new
LogWarpper
(
result
).
warp
());
page
.
setRecords
((
List
<
Logi
nLog
>)
new
LogWarpper
(
result
).
warp
());
return
super
.
packForBT
(
page
);
return
super
.
packForBT
(
page
);
}
}
...
...
guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/LoginLogMapper.java
View file @
27c5d308
...
@@ -3,7 +3,6 @@ package com.stylefeng.guns.modular.system.dao;
...
@@ -3,7 +3,6 @@ package com.stylefeng.guns.modular.system.dao;
import
com.baomidou.mybatisplus.mapper.BaseMapper
;
import
com.baomidou.mybatisplus.mapper.BaseMapper
;
import
com.baomidou.mybatisplus.plugins.Page
;
import
com.baomidou.mybatisplus.plugins.Page
;
import
com.stylefeng.guns.modular.system.model.LoginLog
;
import
com.stylefeng.guns.modular.system.model.LoginLog
;
import
com.stylefeng.guns.modular.system.model.OperationLog
;
import
org.apache.ibatis.annotations.Param
;
import
org.apache.ibatis.annotations.Param
;
import
java.util.List
;
import
java.util.List
;
...
@@ -22,6 +21,7 @@ public interface LoginLogMapper extends BaseMapper<LoginLog> {
...
@@ -22,6 +21,7 @@ public interface LoginLogMapper extends BaseMapper<LoginLog> {
/**
/**
* 获取登录日志
* 获取登录日志
*/
*/
List
<
Map
<
String
,
Object
>>
getLoginLogs
(
@Param
(
"page"
)
Page
<
OperationLog
>
page
,
@Param
(
"beginTime"
)
String
beginTime
,
@Param
(
"endTime"
)
String
endTime
,
@Param
(
"logName"
)
String
logName
,
@Param
(
"orderByField"
)
String
orderByField
,
@Param
(
"isAsc"
)
boolean
isAsc
);
List
<
Map
<
String
,
Object
>>
getLoginLogs
(
@Param
(
"page"
)
Page
<
LoginLog
>
page
,
@Param
(
"beginTime"
)
String
beginTime
,
@Param
(
"endTime"
)
String
endTime
,
@Param
(
"logName"
)
String
logName
,
@Param
(
"orderByField"
)
String
orderByField
,
@Param
(
"isAsc"
)
boolean
isAsc
);
}
}
\ No newline at end of file
guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ILoginLogService.java
View file @
27c5d308
...
@@ -3,7 +3,6 @@ package com.stylefeng.guns.modular.system.service;
...
@@ -3,7 +3,6 @@ package com.stylefeng.guns.modular.system.service;
import
com.baomidou.mybatisplus.plugins.Page
;
import
com.baomidou.mybatisplus.plugins.Page
;
import
com.baomidou.mybatisplus.service.IService
;
import
com.baomidou.mybatisplus.service.IService
;
import
com.stylefeng.guns.modular.system.model.LoginLog
;
import
com.stylefeng.guns.modular.system.model.LoginLog
;
import
com.stylefeng.guns.modular.system.model.OperationLog
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
...
@@ -21,5 +20,5 @@ public interface ILoginLogService extends IService<LoginLog> {
...
@@ -21,5 +20,5 @@ public interface ILoginLogService extends IService<LoginLog> {
/**
/**
* 获取登录日志列表
* 获取登录日志列表
*/
*/
List
<
Map
<
String
,
Object
>>
getLoginLogs
(
Page
<
Operatio
nLog
>
page
,
String
beginTime
,
String
endTime
,
String
logName
,
String
orderByField
,
boolean
asc
);
List
<
Map
<
String
,
Object
>>
getLoginLogs
(
Page
<
Logi
nLog
>
page
,
String
beginTime
,
String
endTime
,
String
logName
,
String
orderByField
,
boolean
asc
);
}
}
guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/LoginLogServiceImpl.java
View file @
27c5d308
...
@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.plugins.Page;
...
@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.plugins.Page;
import
com.baomidou.mybatisplus.service.impl.ServiceImpl
;
import
com.baomidou.mybatisplus.service.impl.ServiceImpl
;
import
com.stylefeng.guns.modular.system.dao.LoginLogMapper
;
import
com.stylefeng.guns.modular.system.dao.LoginLogMapper
;
import
com.stylefeng.guns.modular.system.model.LoginLog
;
import
com.stylefeng.guns.modular.system.model.LoginLog
;
import
com.stylefeng.guns.modular.system.model.OperationLog
;
import
com.stylefeng.guns.modular.system.service.ILoginLogService
;
import
com.stylefeng.guns.modular.system.service.ILoginLogService
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
...
@@ -23,7 +22,7 @@ import java.util.Map;
...
@@ -23,7 +22,7 @@ import java.util.Map;
public
class
LoginLogServiceImpl
extends
ServiceImpl
<
LoginLogMapper
,
LoginLog
>
implements
ILoginLogService
{
public
class
LoginLogServiceImpl
extends
ServiceImpl
<
LoginLogMapper
,
LoginLog
>
implements
ILoginLogService
{
@Override
@Override
public
List
<
Map
<
String
,
Object
>>
getLoginLogs
(
Page
<
Operatio
nLog
>
page
,
String
beginTime
,
String
endTime
,
String
logName
,
String
orderByField
,
boolean
asc
)
{
public
List
<
Map
<
String
,
Object
>>
getLoginLogs
(
Page
<
Logi
nLog
>
page
,
String
beginTime
,
String
endTime
,
String
logName
,
String
orderByField
,
boolean
asc
)
{
return
this
.
baseMapper
.
getLoginLogs
(
page
,
beginTime
,
endTime
,
logName
,
orderByField
,
asc
);
return
this
.
baseMapper
.
getLoginLogs
(
page
,
beginTime
,
endTime
,
logName
,
orderByField
,
asc
);
}
}
}
}
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