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
2bd22986
Commit
2bd22986
authored
Apr 16, 2017
by
fsn
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
重新生成bean
parent
35caa7fa
Show whitespace changes
Inline
Side-by-side
Showing
24 changed files
with
38 additions
and
25 deletions
+38
-25
src/main/java/com/stylefeng/guns/modular/system/controller/LogController.java
+2
-1
src/main/java/com/stylefeng/guns/persistence/dao/DeptMapper.java
+1
-1
src/main/java/com/stylefeng/guns/persistence/dao/DictMapper.java
+1
-1
src/main/java/com/stylefeng/guns/persistence/dao/LoginLogMapper.java
+1
-1
src/main/java/com/stylefeng/guns/persistence/dao/MenuMapper.java
+1
-1
src/main/java/com/stylefeng/guns/persistence/dao/NoticeMapper.java
+1
-1
src/main/java/com/stylefeng/guns/persistence/dao/OperationLogMapper.java
+1
-1
src/main/java/com/stylefeng/guns/persistence/dao/ParameterMapper.java
+1
-1
src/main/java/com/stylefeng/guns/persistence/dao/RelationMapper.java
+1
-1
src/main/java/com/stylefeng/guns/persistence/dao/RoleExtMapper.java
+1
-1
src/main/java/com/stylefeng/guns/persistence/dao/RoleMapper.java
+1
-1
src/main/java/com/stylefeng/guns/persistence/dao/UserMapper.java
+1
-1
src/main/java/com/stylefeng/guns/persistence/model/Dept.java
+1
-1
src/main/java/com/stylefeng/guns/persistence/model/Dict.java
+1
-1
src/main/java/com/stylefeng/guns/persistence/model/LoginLog.java
+1
-1
src/main/java/com/stylefeng/guns/persistence/model/Menu.java
+1
-1
src/main/java/com/stylefeng/guns/persistence/model/Notice.java
+1
-1
src/main/java/com/stylefeng/guns/persistence/model/OperationLog.java
+1
-1
src/main/java/com/stylefeng/guns/persistence/model/Parameter.java
+1
-1
src/main/java/com/stylefeng/guns/persistence/model/Relation.java
+1
-1
src/main/java/com/stylefeng/guns/persistence/model/Role.java
+1
-1
src/main/java/com/stylefeng/guns/persistence/model/RoleExt.java
+1
-1
src/main/java/com/stylefeng/guns/persistence/model/User.java
+1
-1
src/main/webapp/static/modular/system/log/log.js
+14
-2
No files found.
src/main/java/com/stylefeng/guns/modular/system/controller/LogController.java
View file @
2bd22986
...
@@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
...
@@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import
org.springframework.web.bind.annotation.ResponseBody
;
import
org.springframework.web.bind.annotation.ResponseBody
;
import
javax.annotation.Resource
;
import
javax.annotation.Resource
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
...
@@ -44,7 +45,7 @@ public class LogController extends BaseController {
...
@@ -44,7 +45,7 @@ public class LogController extends BaseController {
*/
*/
@RequestMapping
(
"/list"
)
@RequestMapping
(
"/list"
)
@ResponseBody
@ResponseBody
public
Object
list
(){
public
Object
list
(
Date
beginTime
,
Date
endTime
,
String
logName
){
Page
<
OperationLog
>
page
=
new
PageFactory
<
OperationLog
>().
defaultPage
();
Page
<
OperationLog
>
page
=
new
PageFactory
<
OperationLog
>().
defaultPage
();
List
<
Map
<
String
,
Object
>>
operationLogs
=
operationLogMapper
.
selectMapsPage
(
page
,
null
);
List
<
Map
<
String
,
Object
>>
operationLogs
=
operationLogMapper
.
selectMapsPage
(
page
,
null
);
page
.
setRecords
((
List
<
OperationLog
>)
new
LogWarpper
(
operationLogs
).
warp
());
page
.
setRecords
((
List
<
OperationLog
>)
new
LogWarpper
(
operationLogs
).
warp
());
...
...
src/main/java/com/stylefeng/guns/persistence/dao/DeptMapper.java
View file @
2bd22986
...
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
...
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
* </p>
* </p>
*
*
* @author stylefeng
* @author stylefeng
* @since 2017-04-
08
* @since 2017-04-
16
*/
*/
public
interface
DeptMapper
extends
BaseMapper
<
Dept
>
{
public
interface
DeptMapper
extends
BaseMapper
<
Dept
>
{
...
...
src/main/java/com/stylefeng/guns/persistence/dao/DictMapper.java
View file @
2bd22986
...
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
...
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
* </p>
* </p>
*
*
* @author stylefeng
* @author stylefeng
* @since 2017-04-
08
* @since 2017-04-
16
*/
*/
public
interface
DictMapper
extends
BaseMapper
<
Dict
>
{
public
interface
DictMapper
extends
BaseMapper
<
Dict
>
{
...
...
src/main/java/com/stylefeng/guns/persistence/dao/LoginLogMapper.java
View file @
2bd22986
...
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
...
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
* </p>
* </p>
*
*
* @author stylefeng
* @author stylefeng
* @since 2017-04-
08
* @since 2017-04-
16
*/
*/
public
interface
LoginLogMapper
extends
BaseMapper
<
LoginLog
>
{
public
interface
LoginLogMapper
extends
BaseMapper
<
LoginLog
>
{
...
...
src/main/java/com/stylefeng/guns/persistence/dao/MenuMapper.java
View file @
2bd22986
...
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
...
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
* </p>
* </p>
*
*
* @author stylefeng
* @author stylefeng
* @since 2017-04-
08
* @since 2017-04-
16
*/
*/
public
interface
MenuMapper
extends
BaseMapper
<
Menu
>
{
public
interface
MenuMapper
extends
BaseMapper
<
Menu
>
{
...
...
src/main/java/com/stylefeng/guns/persistence/dao/NoticeMapper.java
View file @
2bd22986
...
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
...
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
* </p>
* </p>
*
*
* @author stylefeng
* @author stylefeng
* @since 2017-04-
08
* @since 2017-04-
16
*/
*/
public
interface
NoticeMapper
extends
BaseMapper
<
Notice
>
{
public
interface
NoticeMapper
extends
BaseMapper
<
Notice
>
{
...
...
src/main/java/com/stylefeng/guns/persistence/dao/OperationLogMapper.java
View file @
2bd22986
...
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
...
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
* </p>
* </p>
*
*
* @author stylefeng
* @author stylefeng
* @since 2017-04-
08
* @since 2017-04-
16
*/
*/
public
interface
OperationLogMapper
extends
BaseMapper
<
OperationLog
>
{
public
interface
OperationLogMapper
extends
BaseMapper
<
OperationLog
>
{
...
...
src/main/java/com/stylefeng/guns/persistence/dao/ParameterMapper.java
View file @
2bd22986
...
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
...
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
* </p>
* </p>
*
*
* @author stylefeng
* @author stylefeng
* @since 2017-04-
08
* @since 2017-04-
16
*/
*/
public
interface
ParameterMapper
extends
BaseMapper
<
Parameter
>
{
public
interface
ParameterMapper
extends
BaseMapper
<
Parameter
>
{
...
...
src/main/java/com/stylefeng/guns/persistence/dao/RelationMapper.java
View file @
2bd22986
...
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
...
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
* </p>
* </p>
*
*
* @author stylefeng
* @author stylefeng
* @since 2017-04-
08
* @since 2017-04-
16
*/
*/
public
interface
RelationMapper
extends
BaseMapper
<
Relation
>
{
public
interface
RelationMapper
extends
BaseMapper
<
Relation
>
{
...
...
src/main/java/com/stylefeng/guns/persistence/dao/RoleExtMapper.java
View file @
2bd22986
...
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
...
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
* </p>
* </p>
*
*
* @author stylefeng
* @author stylefeng
* @since 2017-04-
08
* @since 2017-04-
16
*/
*/
public
interface
RoleExtMapper
extends
BaseMapper
<
RoleExt
>
{
public
interface
RoleExtMapper
extends
BaseMapper
<
RoleExt
>
{
...
...
src/main/java/com/stylefeng/guns/persistence/dao/RoleMapper.java
View file @
2bd22986
...
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
...
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
* </p>
* </p>
*
*
* @author stylefeng
* @author stylefeng
* @since 2017-04-
08
* @since 2017-04-
16
*/
*/
public
interface
RoleMapper
extends
BaseMapper
<
Role
>
{
public
interface
RoleMapper
extends
BaseMapper
<
Role
>
{
...
...
src/main/java/com/stylefeng/guns/persistence/dao/UserMapper.java
View file @
2bd22986
...
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
...
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
* </p>
* </p>
*
*
* @author stylefeng
* @author stylefeng
* @since 2017-04-
08
* @since 2017-04-
16
*/
*/
public
interface
UserMapper
extends
BaseMapper
<
User
>
{
public
interface
UserMapper
extends
BaseMapper
<
User
>
{
...
...
src/main/java/com/stylefeng/guns/persistence/model/Dept.java
View file @
2bd22986
...
@@ -12,7 +12,7 @@ import java.io.Serializable;
...
@@ -12,7 +12,7 @@ import java.io.Serializable;
* </p>
* </p>
*
*
* @author stylefeng
* @author stylefeng
* @since 2017-04-
08
* @since 2017-04-
16
*/
*/
@TableName
(
"_dept"
)
@TableName
(
"_dept"
)
public
class
Dept
extends
Model
<
Dept
>
{
public
class
Dept
extends
Model
<
Dept
>
{
...
...
src/main/java/com/stylefeng/guns/persistence/model/Dict.java
View file @
2bd22986
...
@@ -12,7 +12,7 @@ import java.io.Serializable;
...
@@ -12,7 +12,7 @@ import java.io.Serializable;
* </p>
* </p>
*
*
* @author stylefeng
* @author stylefeng
* @since 2017-04-
08
* @since 2017-04-
16
*/
*/
@TableName
(
"_dict"
)
@TableName
(
"_dict"
)
public
class
Dict
extends
Model
<
Dict
>
{
public
class
Dict
extends
Model
<
Dict
>
{
...
...
src/main/java/com/stylefeng/guns/persistence/model/LoginLog.java
View file @
2bd22986
...
@@ -13,7 +13,7 @@ import java.io.Serializable;
...
@@ -13,7 +13,7 @@ import java.io.Serializable;
* </p>
* </p>
*
*
* @author stylefeng
* @author stylefeng
* @since 2017-04-
08
* @since 2017-04-
16
*/
*/
@TableName
(
"_login_log"
)
@TableName
(
"_login_log"
)
public
class
LoginLog
extends
Model
<
LoginLog
>
{
public
class
LoginLog
extends
Model
<
LoginLog
>
{
...
...
src/main/java/com/stylefeng/guns/persistence/model/Menu.java
View file @
2bd22986
...
@@ -12,7 +12,7 @@ import java.io.Serializable;
...
@@ -12,7 +12,7 @@ import java.io.Serializable;
* </p>
* </p>
*
*
* @author stylefeng
* @author stylefeng
* @since 2017-04-
08
* @since 2017-04-
16
*/
*/
@TableName
(
"_menu"
)
@TableName
(
"_menu"
)
public
class
Menu
extends
Model
<
Menu
>
{
public
class
Menu
extends
Model
<
Menu
>
{
...
...
src/main/java/com/stylefeng/guns/persistence/model/Notice.java
View file @
2bd22986
...
@@ -13,7 +13,7 @@ import java.io.Serializable;
...
@@ -13,7 +13,7 @@ import java.io.Serializable;
* </p>
* </p>
*
*
* @author stylefeng
* @author stylefeng
* @since 2017-04-
08
* @since 2017-04-
16
*/
*/
@TableName
(
"_notice"
)
@TableName
(
"_notice"
)
public
class
Notice
extends
Model
<
Notice
>
{
public
class
Notice
extends
Model
<
Notice
>
{
...
...
src/main/java/com/stylefeng/guns/persistence/model/OperationLog.java
View file @
2bd22986
...
@@ -13,7 +13,7 @@ import java.io.Serializable;
...
@@ -13,7 +13,7 @@ import java.io.Serializable;
* </p>
* </p>
*
*
* @author stylefeng
* @author stylefeng
* @since 2017-04-
08
* @since 2017-04-
16
*/
*/
@TableName
(
"_operation_log"
)
@TableName
(
"_operation_log"
)
public
class
OperationLog
extends
Model
<
OperationLog
>
{
public
class
OperationLog
extends
Model
<
OperationLog
>
{
...
...
src/main/java/com/stylefeng/guns/persistence/model/Parameter.java
View file @
2bd22986
...
@@ -12,7 +12,7 @@ import java.io.Serializable;
...
@@ -12,7 +12,7 @@ import java.io.Serializable;
* </p>
* </p>
*
*
* @author stylefeng
* @author stylefeng
* @since 2017-04-
08
* @since 2017-04-
16
*/
*/
@TableName
(
"_parameter"
)
@TableName
(
"_parameter"
)
public
class
Parameter
extends
Model
<
Parameter
>
{
public
class
Parameter
extends
Model
<
Parameter
>
{
...
...
src/main/java/com/stylefeng/guns/persistence/model/Relation.java
View file @
2bd22986
...
@@ -12,7 +12,7 @@ import java.io.Serializable;
...
@@ -12,7 +12,7 @@ import java.io.Serializable;
* </p>
* </p>
*
*
* @author stylefeng
* @author stylefeng
* @since 2017-04-
08
* @since 2017-04-
16
*/
*/
@TableName
(
"_relation"
)
@TableName
(
"_relation"
)
public
class
Relation
extends
Model
<
Relation
>
{
public
class
Relation
extends
Model
<
Relation
>
{
...
...
src/main/java/com/stylefeng/guns/persistence/model/Role.java
View file @
2bd22986
...
@@ -12,7 +12,7 @@ import java.io.Serializable;
...
@@ -12,7 +12,7 @@ import java.io.Serializable;
* </p>
* </p>
*
*
* @author stylefeng
* @author stylefeng
* @since 2017-04-
08
* @since 2017-04-
16
*/
*/
@TableName
(
"_role"
)
@TableName
(
"_role"
)
public
class
Role
extends
Model
<
Role
>
{
public
class
Role
extends
Model
<
Role
>
{
...
...
src/main/java/com/stylefeng/guns/persistence/model/RoleExt.java
View file @
2bd22986
...
@@ -12,7 +12,7 @@ import java.io.Serializable;
...
@@ -12,7 +12,7 @@ import java.io.Serializable;
* </p>
* </p>
*
*
* @author stylefeng
* @author stylefeng
* @since 2017-04-
08
* @since 2017-04-
16
*/
*/
@TableName
(
"_role_ext"
)
@TableName
(
"_role_ext"
)
public
class
RoleExt
extends
Model
<
RoleExt
>
{
public
class
RoleExt
extends
Model
<
RoleExt
>
{
...
...
src/main/java/com/stylefeng/guns/persistence/model/User.java
View file @
2bd22986
...
@@ -13,7 +13,7 @@ import java.io.Serializable;
...
@@ -13,7 +13,7 @@ import java.io.Serializable;
* </p>
* </p>
*
*
* @author stylefeng
* @author stylefeng
* @since 2017-04-
08
* @since 2017-04-
16
*/
*/
@TableName
(
"_user"
)
@TableName
(
"_user"
)
public
class
User
extends
Model
<
User
>
{
public
class
User
extends
Model
<
User
>
{
...
...
src/main/webapp/static/modular/system/log/log.js
View file @
2bd22986
...
@@ -59,11 +59,23 @@ OptLog.detail = function () {
...
@@ -59,11 +59,23 @@ OptLog.detail = function () {
}
}
};
};
/**
* 查询日志列表
*/
OptLog
.
search
=
function
()
{
var
queryData
=
{};
queryData
[
'logName'
]
=
$
(
"#logName"
).
val
();
queryData
[
'beginTime'
]
=
$
(
"#beginTime"
).
val
();
queryData
[
'endTime'
]
=
$
(
"#endTime"
).
val
();
OptLog
.
table
.
refresh
({
query
:
queryData
});
};
$
(
function
()
{
$
(
function
()
{
var
defaultColunms
=
OptLog
.
initColumn
();
var
defaultColunms
=
OptLog
.
initColumn
();
var
table
=
new
BSTable
(
OptLog
.
id
,
"/log/list"
,
defaultColunms
);
var
table
=
new
BSTable
(
OptLog
.
id
,
"/log/list"
,
defaultColunms
);
table
.
setPaginationType
(
"server"
);
table
.
setPaginationType
(
"server"
);
table
.
init
();
OptLog
.
table
=
table
.
init
();
OptLog
.
bindEvent
();
OptLog
.
bindEvent
();
OptLog
.
table
=
table
;
});
});
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