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
b1813c0c
Commit
b1813c0c
authored
Feb 22, 2018
by
stylefeng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
更新结构和注释
parent
7b37b6fa
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
12 additions
and
13 deletions
+12
-13
guns-admin/src/main/java/com/stylefeng/guns/modular/code/controller/CodeController.java
+0
-1
guns-admin/src/main/java/com/stylefeng/guns/modular/flowable/controller/ExpenseController.java
+2
-2
guns-admin/src/main/java/com/stylefeng/guns/modular/flowable/controller/ProcessController.java
+2
-2
guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/DeptController.java
+1
-1
guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/DictController.java
+1
-1
guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/LogController.java
+1
-1
guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/LoginLogController.java
+1
-1
guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/NoticeController.java
+2
-2
guns-generator/src/main/resources/gunsTemplate/advanced/Controller.java.btl
+2
-2
No files found.
guns-admin/src/main/java/com/stylefeng/guns/modular/code/controller/CodeController.java
View file @
b1813c0c
...
@@ -32,7 +32,6 @@ public class CodeController extends BaseController {
...
@@ -32,7 +32,6 @@ public class CodeController extends BaseController {
@Autowired
@Autowired
private
DruidProperties
druidProperties
;
private
DruidProperties
druidProperties
;
/**
/**
* 跳转到代码生成主页
* 跳转到代码生成主页
*/
*/
...
...
guns-admin/src/main/java/com/stylefeng/guns/modular/flowable/controller/ExpenseController.java
View file @
b1813c0c
...
@@ -79,7 +79,7 @@ public class ExpenseController extends BaseController {
...
@@ -79,7 +79,7 @@ public class ExpenseController extends BaseController {
@ResponseBody
@ResponseBody
public
Object
add
(
Expense
expense
)
{
public
Object
add
(
Expense
expense
)
{
expenseService
.
add
(
expense
);
expenseService
.
add
(
expense
);
return
super
.
SUCCESS_TIP
;
return
SUCCESS_TIP
;
}
}
/**
/**
...
@@ -99,7 +99,7 @@ public class ExpenseController extends BaseController {
...
@@ -99,7 +99,7 @@ public class ExpenseController extends BaseController {
@ResponseBody
@ResponseBody
public
Object
update
(
Expense
expense
)
{
public
Object
update
(
Expense
expense
)
{
expenseService
.
updateById
(
expense
);
expenseService
.
updateById
(
expense
);
return
super
.
SUCCESS_TIP
;
return
SUCCESS_TIP
;
}
}
/**
/**
...
...
guns-admin/src/main/java/com/stylefeng/guns/modular/flowable/controller/ProcessController.java
View file @
b1813c0c
...
@@ -55,7 +55,7 @@ public class ProcessController extends BaseController {
...
@@ -55,7 +55,7 @@ public class ProcessController extends BaseController {
@ResponseBody
@ResponseBody
public
Object
pass
(
String
taskId
)
{
public
Object
pass
(
String
taskId
)
{
expenseService
.
pass
(
taskId
);
expenseService
.
pass
(
taskId
);
return
super
.
SUCCESS_TIP
;
return
SUCCESS_TIP
;
}
}
/**
/**
...
@@ -65,6 +65,6 @@ public class ProcessController extends BaseController {
...
@@ -65,6 +65,6 @@ public class ProcessController extends BaseController {
@ResponseBody
@ResponseBody
public
Object
unPass
(
String
taskId
)
{
public
Object
unPass
(
String
taskId
)
{
expenseService
.
unPass
(
taskId
);
expenseService
.
unPass
(
taskId
);
return
super
.
SUCCESS_TIP
;
return
SUCCESS_TIP
;
}
}
}
}
guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/DeptController.java
View file @
b1813c0c
...
@@ -137,7 +137,7 @@ public class DeptController extends BaseController {
...
@@ -137,7 +137,7 @@ public class DeptController extends BaseController {
}
}
deptSetPids
(
dept
);
deptSetPids
(
dept
);
deptMapper
.
updateById
(
dept
);
deptMapper
.
updateById
(
dept
);
return
super
.
SUCCESS_TIP
;
return
SUCCESS_TIP
;
}
}
/**
/**
...
...
guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/DictController.java
View file @
b1813c0c
...
@@ -128,7 +128,7 @@ public class DictController extends BaseController {
...
@@ -128,7 +128,7 @@ public class DictController extends BaseController {
throw
new
GunsException
(
BizExceptionEnum
.
REQUEST_NULL
);
throw
new
GunsException
(
BizExceptionEnum
.
REQUEST_NULL
);
}
}
dictService
.
editDict
(
dictId
,
dictName
,
dictValues
);
dictService
.
editDict
(
dictId
,
dictName
,
dictValues
);
return
super
.
SUCCESS_TIP
;
return
SUCCESS_TIP
;
}
}
/**
/**
...
...
guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/LogController.java
View file @
b1813c0c
...
@@ -83,6 +83,6 @@ public class LogController extends BaseController {
...
@@ -83,6 +83,6 @@ public class LogController extends BaseController {
@ResponseBody
@ResponseBody
public
Object
delLog
()
{
public
Object
delLog
()
{
SqlRunner
.
db
().
delete
(
"delete from sys_operation_log"
);
SqlRunner
.
db
().
delete
(
"delete from sys_operation_log"
);
return
super
.
SUCCESS_TIP
;
return
SUCCESS_TIP
;
}
}
}
}
guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/LoginLogController.java
View file @
b1813c0c
...
@@ -64,6 +64,6 @@ public class LoginLogController extends BaseController {
...
@@ -64,6 +64,6 @@ public class LoginLogController extends BaseController {
@ResponseBody
@ResponseBody
public
Object
delLog
()
{
public
Object
delLog
()
{
SqlRunner
.
db
().
delete
(
"delete from sys_login_log"
);
SqlRunner
.
db
().
delete
(
"delete from sys_login_log"
);
return
super
.
SUCCESS_TIP
;
return
SUCCESS_TIP
;
}
}
}
}
guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/NoticeController.java
View file @
b1813c0c
...
@@ -103,7 +103,7 @@ public class NoticeController extends BaseController {
...
@@ -103,7 +103,7 @@ public class NoticeController extends BaseController {
notice
.
setCreater
(
ShiroKit
.
getUser
().
getId
());
notice
.
setCreater
(
ShiroKit
.
getUser
().
getId
());
notice
.
setCreatetime
(
new
Date
());
notice
.
setCreatetime
(
new
Date
());
notice
.
insert
();
notice
.
insert
();
return
super
.
SUCCESS_TIP
;
return
SUCCESS_TIP
;
}
}
/**
/**
...
@@ -136,7 +136,7 @@ public class NoticeController extends BaseController {
...
@@ -136,7 +136,7 @@ public class NoticeController extends BaseController {
old
.
setTitle
(
notice
.
getTitle
());
old
.
setTitle
(
notice
.
getTitle
());
old
.
setContent
(
notice
.
getContent
());
old
.
setContent
(
notice
.
getContent
());
old
.
updateById
();
old
.
updateById
();
return
super
.
SUCCESS_TIP
;
return
SUCCESS_TIP
;
}
}
}
}
guns-generator/src/main/resources/gunsTemplate/advanced/Controller.java.btl
View file @
b1813c0c
...
@@ -62,7 +62,7 @@ public class ${context.bizEnBigName}Controller extends BaseController {
...
@@ -62,7 +62,7 @@ public class ${context.bizEnBigName}Controller extends BaseController {
@
ResponseBody
@
ResponseBody
public
Object
add
(${
context
.
entityName
}
${
context
.
bizEnName
})
{
public
Object
add
(${
context
.
entityName
}
${
context
.
bizEnName
})
{
${
context
.
bizEnName
}
Service
.
insert
(${
context
.
bizEnName
});
${
context
.
bizEnName
}
Service
.
insert
(${
context
.
bizEnName
});
return
super
.
SUCCESS_TIP
;
return
SUCCESS_TIP
;
}
}
/**
/**
...
@@ -82,7 +82,7 @@ public class ${context.bizEnBigName}Controller extends BaseController {
...
@@ -82,7 +82,7 @@ public class ${context.bizEnBigName}Controller extends BaseController {
@
ResponseBody
@
ResponseBody
public
Object
update
(${
context
.
entityName
}
${
context
.
bizEnName
})
{
public
Object
update
(${
context
.
entityName
}
${
context
.
bizEnName
})
{
${
context
.
bizEnName
}
Service
.
updateById
(${
context
.
bizEnName
});
${
context
.
bizEnName
}
Service
.
updateById
(${
context
.
bizEnName
});
return
super
.
SUCCESS_TIP
;
return
SUCCESS_TIP
;
}
}
/**
/**
...
...
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