Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
education
Project
Project
Details
Activity
Releases
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
李丛阳
education
Commits
ea2bceb7
Commit
ea2bceb7
authored
Jan 09, 2018
by
YangZhaoJun1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改返回值
parent
356d1ce5
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
21 additions
and
27 deletions
+21
-27
BFileController.java
...rg/rcisoft/business/bfile/controller/BFileController.java
+9
-15
BSlController.java
...va/org/rcisoft/business/bsl/controller/BSlController.java
+4
-4
SysDeptController.java
...va/org/rcisoft/sys/dept/controller/SysDeptController.java
+2
-2
SysMenuController.java
...va/org/rcisoft/sys/menu/controller/SysMenuController.java
+2
-2
SysRoleController.java
...va/org/rcisoft/sys/role/controller/SysRoleController.java
+4
-4
No files found.
src/main/java/org/rcisoft/business/bfile/controller/BFileController.java
View file @
ea2bceb7
...
@@ -115,22 +115,11 @@ public class BFileController extends PaginationController<BFile> {
...
@@ -115,22 +115,11 @@ public class BFileController extends PaginationController<BFile> {
@PostMapping
(
value
=
"/uploadVideo"
)
@PostMapping
(
value
=
"/uploadVideo"
)
public
Result
uploadVideo
(
BFile
bFile
,
HttpServletRequest
request
)
{
public
Result
uploadVideo
(
BFile
bFile
,
HttpServletRequest
request
)
{
List
<
MultipartFile
>
list
=
((
MultipartHttpServletRequest
)
request
).
getFiles
(
"file"
);
List
<
MultipartFile
>
list
=
((
MultipartHttpServletRequest
)
request
).
getFiles
(
"file"
);
try
{
String
videoUrl
=
bFileService
.
uploadVideoToServer
(
list
,
bFile
,
getToken
());
String
videoUrl
=
bFileService
.
uploadVideoToServer
(
list
,
bFile
,
getToken
());
return
Result
.
builder
(
new
PersistModel
(
1
),
return
Result
.
builder
(
new
PersistModel
(
1
),
"上传成功"
,
"上传成功"
,
MessageConstant
.
MESSAGE_ALERT_ERROR
,
MessageConstant
.
MESSAGE_ALERT_ERROR
,
videoUrl
);
videoUrl
);
}
catch
(
Exception
e
){
e
.
printStackTrace
();
return
Result
.
builder
(
new
PersistModel
(
2
),
MessageConstant
.
MESSAGE_ALERT_SUCCESS
,
MessageConstant
.
MESSAGE_ALERT_ERROR
,
""
);
}
}
}
/**
/**
...
@@ -173,11 +162,16 @@ public class BFileController extends PaginationController<BFile> {
...
@@ -173,11 +162,16 @@ public class BFileController extends PaginationController<BFile> {
e
.
printStackTrace
();
e
.
printStackTrace
();
}
}
}
}
return
Result
.
builder
(
new
PersistModel
(
1
),
MessageConstant
.
MESSAGE_ALERT_SUCCESS
,
MessageConstant
.
MESSAGE_ALERT_ERROR
,
""
);
}
else
{
return
Result
.
builder
(
new
PersistModel
(
0
),
MessageConstant
.
MESSAGE_ALERT_SUCCESS
,
MessageConstant
.
MESSAGE_ALERT_ERROR
,
""
);
}
}
return
Result
.
builder
(
new
PersistModel
(
2
),
MessageConstant
.
MESSAGE_ALERT_SUCCESS
,
MessageConstant
.
MESSAGE_ALERT_ERROR
,
""
);
}
}
}
}
src/main/java/org/rcisoft/business/bsl/controller/BSlController.java
View file @
ea2bceb7
...
@@ -252,11 +252,11 @@ public class BSlController extends PaginationController<BSl> {
...
@@ -252,11 +252,11 @@ public class BSlController extends PaginationController<BSl> {
if
(
data
>
0
){
if
(
data
>
0
){
return
Result
.
builder
(
new
PersistModel
(
1
),
"该学生选了该课程"
,
"该学生没有选该课程"
,
1
);
return
Result
.
builder
(
new
PersistModel
(
1
),
"该学生选了该课程"
,
"该学生没有选该课程"
,
1
);
}
else
{
}
else
{
return
Result
.
builder
(
new
PersistModel
(
2
),
"该学生选了该课程"
,
"该学生没有选该课程"
,
0
);
return
Result
.
builder
(
new
PersistModel
(
0
),
"该学生选了该课程"
,
"该学生没有选该课程"
,
0
);
}
}
}
catch
(
Exception
e
){
}
catch
(
Exception
e
){
e
.
printStackTrace
();
e
.
printStackTrace
();
return
Result
.
builder
(
new
PersistModel
(
2
),
"方法出错"
,
"方法出错"
,
""
);
return
Result
.
builder
(
new
PersistModel
(
0
),
"方法出错"
,
"方法出错"
,
""
);
}
}
}
}
...
@@ -272,11 +272,11 @@ public class BSlController extends PaginationController<BSl> {
...
@@ -272,11 +272,11 @@ public class BSlController extends PaginationController<BSl> {
if
(
data
>
0
){
if
(
data
>
0
){
return
Result
.
builder
(
new
PersistModel
(
1
),
"是该老师的课"
,
"不是该老师的课"
,
true
);
return
Result
.
builder
(
new
PersistModel
(
1
),
"是该老师的课"
,
"不是该老师的课"
,
true
);
}
else
{
}
else
{
return
Result
.
builder
(
new
PersistModel
(
2
),
"是该老师的课"
,
"不是该老师的课"
,
false
);
return
Result
.
builder
(
new
PersistModel
(
0
),
"是该老师的课"
,
"不是该老师的课"
,
false
);
}
}
}
catch
(
Exception
e
){
}
catch
(
Exception
e
){
e
.
printStackTrace
();
e
.
printStackTrace
();
return
Result
.
builder
(
new
PersistModel
(
2
),
"方法出错"
,
"方法出错"
,
""
);
return
Result
.
builder
(
new
PersistModel
(
0
),
"方法出错"
,
"方法出错"
,
""
);
}
}
}
}
...
...
src/main/java/org/rcisoft/sys/dept/controller/SysDeptController.java
View file @
ea2bceb7
...
@@ -89,7 +89,7 @@ public class SysDeptController extends ResponseController {
...
@@ -89,7 +89,7 @@ public class SysDeptController extends ResponseController {
if
(
super
.
hasErrors
(
br
)){
if
(
super
.
hasErrors
(
br
)){
ValidatedResult
vr
=
new
ValidatedResult
();
ValidatedResult
vr
=
new
ValidatedResult
();
vr
.
dealBindingResult
(
br
);
vr
.
dealBindingResult
(
br
);
return
Result
.
builder
(
new
PersistModel
(
2
),
return
Result
.
builder
(
new
PersistModel
(
0
),
MessageConstant
.
MESSAGE_ALERT_SUCCESS
,
MessageConstant
.
MESSAGE_ALERT_SUCCESS
,
MessageConstant
.
MESSAGE_ALERT_INFO_INVALID
,
MessageConstant
.
MESSAGE_ALERT_INFO_INVALID
,
vr
);
vr
);
...
@@ -118,7 +118,7 @@ public class SysDeptController extends ResponseController {
...
@@ -118,7 +118,7 @@ public class SysDeptController extends ResponseController {
if
(
super
.
hasErrors
(
br
)){
if
(
super
.
hasErrors
(
br
)){
ValidatedResult
vr
=
new
ValidatedResult
();
ValidatedResult
vr
=
new
ValidatedResult
();
vr
.
dealBindingResult
(
br
);
vr
.
dealBindingResult
(
br
);
return
Result
.
builder
(
new
PersistModel
(
2
),
return
Result
.
builder
(
new
PersistModel
(
0
),
MessageConstant
.
MESSAGE_ALERT_SUCCESS
,
MessageConstant
.
MESSAGE_ALERT_SUCCESS
,
MessageConstant
.
MESSAGE_ALERT_INFO_INVALID
,
MessageConstant
.
MESSAGE_ALERT_INFO_INVALID
,
vr
);
vr
);
...
...
src/main/java/org/rcisoft/sys/menu/controller/SysMenuController.java
View file @
ea2bceb7
...
@@ -86,7 +86,7 @@ public class SysMenuController extends ResponseController {
...
@@ -86,7 +86,7 @@ public class SysMenuController extends ResponseController {
if
(
super
.
hasErrors
(
br
)){
if
(
super
.
hasErrors
(
br
)){
ValidatedResult
vr
=
new
ValidatedResult
();
ValidatedResult
vr
=
new
ValidatedResult
();
vr
.
dealBindingResult
(
br
);
vr
.
dealBindingResult
(
br
);
return
Result
.
builder
(
new
PersistModel
(
2
),
return
Result
.
builder
(
new
PersistModel
(
0
),
MessageConstant
.
MESSAGE_ALERT_INFO_INVALID
,
MessageConstant
.
MESSAGE_ALERT_INFO_INVALID
,
MessageConstant
.
MESSAGE_ALERT_ERROR
,
MessageConstant
.
MESSAGE_ALERT_ERROR
,
vr
);
vr
);
...
@@ -118,7 +118,7 @@ public class SysMenuController extends ResponseController {
...
@@ -118,7 +118,7 @@ public class SysMenuController extends ResponseController {
if
(
super
.
hasErrors
(
br
)){
if
(
super
.
hasErrors
(
br
)){
ValidatedResult
vr
=
new
ValidatedResult
();
ValidatedResult
vr
=
new
ValidatedResult
();
vr
.
dealBindingResult
(
br
);
vr
.
dealBindingResult
(
br
);
return
Result
.
builder
(
new
PersistModel
(
2
),
return
Result
.
builder
(
new
PersistModel
(
0
),
MessageConstant
.
MESSAGE_ALERT_INFO_INVALID
,
MessageConstant
.
MESSAGE_ALERT_INFO_INVALID
,
MessageConstant
.
MESSAGE_ALERT_ERROR
,
MessageConstant
.
MESSAGE_ALERT_ERROR
,
vr
);
vr
);
...
...
src/main/java/org/rcisoft/sys/role/controller/SysRoleController.java
View file @
ea2bceb7
...
@@ -86,7 +86,7 @@ public class SysRoleController extends PaginationController<SysRole> {
...
@@ -86,7 +86,7 @@ public class SysRoleController extends PaginationController<SysRole> {
sysRole
);
sysRole
);
else
else
return
Result
.
builder
(
new
PersistModel
(
2
),
return
Result
.
builder
(
new
PersistModel
(
0
),
MessageConstant
.
MESSAGE_ALERT_SUCCESS
,
MessageConstant
.
MESSAGE_ALERT_SUCCESS
,
MessageConstant
.
MESSAGE_ALERT_ERROR
,
MessageConstant
.
MESSAGE_ALERT_ERROR
,
sysRole
);
sysRole
);
...
@@ -114,7 +114,7 @@ public class SysRoleController extends PaginationController<SysRole> {
...
@@ -114,7 +114,7 @@ public class SysRoleController extends PaginationController<SysRole> {
ValidatedResult
vr
=
new
ValidatedResult
();
ValidatedResult
vr
=
new
ValidatedResult
();
vr
.
dealBindingResult
(
br
);
vr
.
dealBindingResult
(
br
);
result
.
setSucessMessage
(
MessageConstant
.
MESSAGE_ALERT_INFO_INVALID
,
vr
);
result
.
setSucessMessage
(
MessageConstant
.
MESSAGE_ALERT_INFO_INVALID
,
vr
);
return
Result
.
builder
(
new
PersistModel
(
2
),
return
Result
.
builder
(
new
PersistModel
(
0
),
MessageConstant
.
MESSAGE_ALERT_SUCCESS
,
MessageConstant
.
MESSAGE_ALERT_SUCCESS
,
MessageConstant
.
MESSAGE_ALERT_INFO_INVALID
,
MessageConstant
.
MESSAGE_ALERT_INFO_INVALID
,
vr
);
vr
);
...
@@ -138,7 +138,7 @@ public class SysRoleController extends PaginationController<SysRole> {
...
@@ -138,7 +138,7 @@ public class SysRoleController extends PaginationController<SysRole> {
MessageConstant
.
MESSAGE_ALERT_ERROR
,
MessageConstant
.
MESSAGE_ALERT_ERROR
,
id
);
id
);
else
else
return
Result
.
builder
(
new
PersistModel
(
2
),
return
Result
.
builder
(
new
PersistModel
(
0
),
MessageConstant
.
MESSAGE_ALERT_SUCCESS
,
MessageConstant
.
MESSAGE_ALERT_SUCCESS
,
MessageConstant
.
MESSAGE_ALERT_ERROR
,
MessageConstant
.
MESSAGE_ALERT_ERROR
,
id
);
id
);
...
@@ -157,7 +157,7 @@ public class SysRoleController extends PaginationController<SysRole> {
...
@@ -157,7 +157,7 @@ public class SysRoleController extends PaginationController<SysRole> {
MessageConstant
.
MESSAGE_ALERT_ERROR
,
MessageConstant
.
MESSAGE_ALERT_ERROR
,
roleId
);
roleId
);
else
else
return
Result
.
builder
(
new
PersistModel
(
2
),
return
Result
.
builder
(
new
PersistModel
(
0
),
MessageConstant
.
MESSAGE_ALERT_ERROR
,
MessageConstant
.
MESSAGE_ALERT_ERROR
,
MessageConstant
.
MESSAGE_ALERT_ERROR
,
MessageConstant
.
MESSAGE_ALERT_ERROR
,
roleId
);
roleId
);
...
...
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