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
d3df9088
Commit
d3df9088
authored
Mar 21, 2018
by
curryft
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
数据库修改
parent
23177175
Changes
49
Hide whitespace changes
Inline
Side-by-side
Showing
49 changed files
with
346 additions
and
106 deletions
+346
-106
BCarouselController.java
...ft/business/bcarousel/controller/BCarouselController.java
+5
-5
BCarousel.java
...java/org/rcisoft/business/bcarousel/entity/BCarousel.java
+12
-0
BChapterController.java
...soft/business/bchapter/controller/BChapterController.java
+2
-2
BChapter.java
...n/java/org/rcisoft/business/bchapter/entity/BChapter.java
+14
-0
BClassController.java
.../rcisoft/business/bclass/controller/BClassController.java
+3
-3
BClass.java
src/main/java/org/rcisoft/business/bclass/entity/BClass.java
+7
-1
BDirectionController.java
.../business/bdirection/controller/BDirectionController.java
+2
-2
BDirection.java
...va/org/rcisoft/business/bdirection/entity/BDirection.java
+6
-1
BFileController.java
...rg/rcisoft/business/bfile/controller/BFileController.java
+2
-2
BFile.java
src/main/java/org/rcisoft/business/bfile/entity/BFile.java
+18
-0
BImageController.java
.../rcisoft/business/bimage/controller/BImageController.java
+2
-2
BImage.java
src/main/java/org/rcisoft/business/bimage/entity/BImage.java
+6
-0
BLessonController.java
...cisoft/business/blesson/controller/BLessonController.java
+4
-4
BLesson.java
...ain/java/org/rcisoft/business/blesson/entity/BLesson.java
+7
-1
BLessonDirection.java
...org/rcisoft/business/blesson/entity/BLessonDirection.java
+10
-4
BNewsController.java
...rg/rcisoft/business/bnews/controller/BNewsController.java
+2
-2
BNews.java
src/main/java/org/rcisoft/business/bnews/entity/BNews.java
+4
-0
BOpinionController.java
...soft/business/bopinion/controller/BOpinionController.java
+3
-1
BOpinion.java
...n/java/org/rcisoft/business/bopinion/entity/BOpinion.java
+8
-3
BRClassStudentController.java
...s/brclassstudent/controller/BRClassStudentController.java
+3
-3
BRClassStudent.java
...cisoft/business/brclassstudent/entity/BRClassStudent.java
+8
-0
BRSlStudentController.java
...usiness/brslstudent/controller/BRSlStudentController.java
+3
-3
BRSlStudent.java
.../org/rcisoft/business/brslstudent/entity/BRSlStudent.java
+8
-1
BSlController.java
...va/org/rcisoft/business/bsl/controller/BSlController.java
+6
-6
BSl.java
src/main/java/org/rcisoft/business/bsl/entity/BSl.java
+20
-6
BSlApplyController.java
...soft/business/bslapply/controller/BSlApplyController.java
+5
-5
ApplyFormDTO.java
.../java/org/rcisoft/business/bslapply/dto/ApplyFormDTO.java
+10
-1
BSlApply.java
...n/java/org/rcisoft/business/bslapply/entity/BSlApply.java
+9
-2
BStudentController.java
...soft/business/bstudent/controller/BStudentController.java
+5
-4
BStudent.java
...n/java/org/rcisoft/business/bstudent/entity/BStudent.java
+10
-0
BTeacherController.java
...soft/business/bteacher/controller/BTeacherController.java
+2
-2
BTeacher.java
...n/java/org/rcisoft/business/bteacher/entity/BTeacher.java
+7
-0
BTermController.java
...rg/rcisoft/business/bterm/controller/BTermController.java
+4
-4
BTermDTO.java
src/main/java/org/rcisoft/business/bterm/dto/BTermDTO.java
+16
-0
BTerm.java
src/main/java/org/rcisoft/business/bterm/entity/BTerm.java
+9
-0
TExamInfoController.java
...ft/business/texaminfo/controller/TExamInfoController.java
+2
-1
TExamDetail.java
...va/org/rcisoft/business/texaminfo/entity/TExamDetail.java
+12
-4
TExamInfo.java
...java/org/rcisoft/business/texaminfo/entity/TExamInfo.java
+8
-3
TPaper.java
src/main/java/org/rcisoft/business/tpaper/entity/TPaper.java
+6
-2
TPaperDetail.java
...java/org/rcisoft/business/tpaper/entity/TPaperDetail.java
+8
-3
TPaperSection.java
...ava/org/rcisoft/business/tpaper/entity/TPaperSection.java
+6
-2
TPaperChapterController.java
...ess/tpaperchapter/controller/TPaperChapterController.java
+3
-3
TPaperChapter.java
.../rcisoft/business/tpaperchapter/entity/TPaperChapter.java
+8
-3
TQuestionController.java
...ft/business/tquestion/controller/TQuestionController.java
+5
-4
TQuestion.java
...java/org/rcisoft/business/tquestion/entity/TQuestion.java
+12
-5
TQuestionOptions.java
...g/rcisoft/business/tquestion/entity/TQuestionOptions.java
+6
-2
SysRoleController.java
...va/org/rcisoft/sys/role/controller/SysRoleController.java
+2
-2
SysRole.java
src/main/java/org/rcisoft/sys/role/entity/SysRole.java
+6
-0
SysUser.java
src/main/java/org/rcisoft/sys/user/entity/SysUser.java
+20
-2
No files found.
src/main/java/org/rcisoft/business/bcarousel/controller/BCarouselController.java
View file @
d3df9088
...
@@ -40,14 +40,14 @@ public class BCarouselController extends PaginationController<BCarousel> {
...
@@ -40,14 +40,14 @@ public class BCarouselController extends PaginationController<BCarousel> {
@ApiOperation
(
value
=
"添加/编辑轮播图"
,
notes
=
"businessId为空时是添加方法,不为空时是修改方法"
)
@ApiOperation
(
value
=
"添加/编辑轮播图"
,
notes
=
"businessId为空时是添加方法,不为空时是修改方法"
)
@ApiImplicitParams
({
@ApiImplicitParam
(
name
=
"businessId"
,
value
=
"businessId"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParams
({
@ApiImplicitParam
(
name
=
"businessId"
,
value
=
"businessId"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"carouselDes"
,
value
=
"轮播描述"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"carouselDes"
,
value
=
"轮播描述
(1-200)
"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"carouselUrl"
,
value
=
"轮播图片"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"carouselUrl"
,
value
=
"轮播图片
(1-200)
"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"carouselSort"
,
value
=
"排序"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"carouselSort"
,
value
=
"排序"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"isOpen"
,
value
=
"是否显示 0未显示,1显示"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"isOpen"
,
value
=
"是否显示 0未显示,1显示"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"isNewWindow"
,
value
=
"是否跳转窗口"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"isNewWindow"
,
value
=
"是否跳转窗口"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"linkUrl"
,
value
=
"链接"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"linkUrl"
,
value
=
"链接
(0-200)
"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"imageType"
,
value
=
"图片类型"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"imageType"
,
value
=
"图片类型
(0-30)
"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"imageId"
,
value
=
"图片id"
,
required
=
false
,
dataType
=
"varchar"
)})
@ApiImplicitParam
(
name
=
"imageId"
,
value
=
"图片id
(0-60)
"
,
required
=
false
,
dataType
=
"varchar"
)})
@PreAuthorize
(
"hasRole('ROLE_1001')"
)
@PreAuthorize
(
"hasRole('ROLE_1001')"
)
@PostMapping
(
value
=
"/add"
)
@PostMapping
(
value
=
"/add"
)
public
Result
add
(
BCarousel
bCarousel
)
{
public
Result
add
(
BCarousel
bCarousel
)
{
...
...
src/main/java/org/rcisoft/business/bcarousel/entity/BCarousel.java
View file @
d3df9088
...
@@ -3,6 +3,8 @@ package org.rcisoft.business.bcarousel.entity;
...
@@ -3,6 +3,8 @@ package org.rcisoft.business.bcarousel.entity;
import
lombok.AllArgsConstructor
;
import
lombok.AllArgsConstructor
;
import
lombok.NoArgsConstructor
;
import
lombok.NoArgsConstructor
;
import
org.hibernate.validator.constraints.Length
;
import
org.hibernate.validator.constraints.NotBlank
;
import
org.rcisoft.core.entity.IdEntity
;
import
org.rcisoft.core.entity.IdEntity
;
import
lombok.Data
;
import
lombok.Data
;
...
@@ -22,8 +24,12 @@ public class BCarousel extends IdEntity<BCarousel> {
...
@@ -22,8 +24,12 @@ public class BCarousel extends IdEntity<BCarousel> {
private
static
final
long
serialVersionUID
=
-
4024897937254829705L
;
private
static
final
long
serialVersionUID
=
-
4024897937254829705L
;
/*轮播描述*/
/*轮播描述*/
@Length
(
min
=
1
,
max
=
256
,
message
=
"长度最小为1,最大为256"
)
@NotBlank
private
String
carouselDes
;
private
String
carouselDes
;
/*轮播图片*/
/*轮播图片*/
@Length
(
min
=
1
,
max
=
256
,
message
=
"长度最小为1,最大为256"
)
@NotBlank
private
String
carouselUrl
;
private
String
carouselUrl
;
/*排序*/
/*排序*/
private
Integer
carouselSort
;
private
Integer
carouselSort
;
...
@@ -32,10 +38,16 @@ public class BCarousel extends IdEntity<BCarousel> {
...
@@ -32,10 +38,16 @@ public class BCarousel extends IdEntity<BCarousel> {
/*是否跳转窗口*/
/*是否跳转窗口*/
private
String
isNewWindow
;
private
String
isNewWindow
;
/*链接*/
/*链接*/
@Length
(
min
=
1
,
max
=
256
,
message
=
"长度最小为1,最大为256"
)
@NotBlank
private
String
linkUrl
;
private
String
linkUrl
;
/*图片类型*/
/*图片类型*/
@Length
(
min
=
1
,
max
=
32
,
message
=
"长度最小为1,最大为32"
)
@NotBlank
private
String
imageType
;
private
String
imageType
;
/*图片id*/
/*图片id*/
@Length
(
min
=
1
,
max
=
64
,
message
=
"长度最小为1,最大为64"
)
@NotBlank
private
String
imageId
;
private
String
imageId
;
}
}
...
...
src/main/java/org/rcisoft/business/bchapter/controller/BChapterController.java
View file @
d3df9088
...
@@ -59,8 +59,8 @@ public class BChapterController extends PaginationController<BChapter> {
...
@@ -59,8 +59,8 @@ public class BChapterController extends PaginationController<BChapter> {
@ApiOperation
(
value
=
"添加/编辑章节"
,
notes
=
"businessId为空时是添加方法,不为空时是修改方法"
)
@ApiOperation
(
value
=
"添加/编辑章节"
,
notes
=
"businessId为空时是添加方法,不为空时是修改方法"
)
@ApiImplicitParams
({
@ApiImplicitParam
(
name
=
"businessId"
,
value
=
"businessId"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParams
({
@ApiImplicitParam
(
name
=
"businessId"
,
value
=
"businessId"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"slId"
,
value
=
"开课id"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"slId"
,
value
=
"开课id"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"chapterName"
,
value
=
"章节名称"
,
required
=
true
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"chapterName"
,
value
=
"章节名称
(1-50)
"
,
required
=
true
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"pid"
,
value
=
"上一级"
,
required
=
true
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"pid"
,
value
=
"上一级
(1-50)
"
,
required
=
true
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"classHour"
,
value
=
"课时"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"classHour"
,
value
=
"课时"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"experimentType"
,
value
=
"实验类型,1:java单文件 2:java工程 3:html单文件 4:html工程"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"experimentType"
,
value
=
"实验类型,1:java单文件 2:java工程 3:html单文件 4:html工程"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"lessonOrSl"
,
value
=
"课程或开课;0:开课 1:课程"
,
required
=
true
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"lessonOrSl"
,
value
=
"课程或开课;0:开课 1:课程"
,
required
=
true
,
dataType
=
"varchar"
),
...
...
src/main/java/org/rcisoft/business/bchapter/entity/BChapter.java
View file @
d3df9088
...
@@ -5,6 +5,7 @@ import lombok.AllArgsConstructor;
...
@@ -5,6 +5,7 @@ import lombok.AllArgsConstructor;
import
lombok.Data
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
import
lombok.NoArgsConstructor
;
import
org.hibernate.validator.constraints.Length
;
import
org.hibernate.validator.constraints.Length
;
import
org.hibernate.validator.constraints.NotBlank
;
import
org.hibernate.validator.constraints.NotEmpty
;
import
org.hibernate.validator.constraints.NotEmpty
;
import
org.hibernate.validator.constraints.Range
;
import
org.hibernate.validator.constraints.Range
;
import
org.rcisoft.business.bchapter.dao.BChapterRepository
;
import
org.rcisoft.business.bchapter.dao.BChapterRepository
;
...
@@ -29,22 +30,31 @@ public class BChapter extends IdEntity<BChapter> {
...
@@ -29,22 +30,31 @@ public class BChapter extends IdEntity<BChapter> {
private
static
final
long
serialVersionUID
=
-
8023388256391391541L
;
private
static
final
long
serialVersionUID
=
-
8023388256391391541L
;
/*开课id*/
/*开课id*/
//@NotEmpty(message = "开课id必填")
//@NotEmpty(message = "开课id必填")
@Length
(
min
=
1
,
max
=
64
,
message
=
"长度最小为1,最大为50"
)
@NotBlank
private
String
slId
;
private
String
slId
;
/*章节名称*/
/*章节名称*/
@NotBlank
@Length
(
min
=
1
,
max
=
50
,
message
=
"长度最小为1,最大为50"
)
@Length
(
min
=
1
,
max
=
50
,
message
=
"长度最小为1,最大为50"
)
private
String
chapterName
;
private
String
chapterName
;
/*等级*/
/*等级*/
@Range
(
max
=
2
,
min
=
1
,
message
=
"等级最小为1,最大为2"
)
@Range
(
max
=
2
,
min
=
1
,
message
=
"等级最小为1,最大为2"
)
private
Byte
chapterLevel
;
private
Byte
chapterLevel
;
/*父ID*/
/*父ID*/
@Length
(
min
=
1
,
max
=
64
,
message
=
"长度最小为1,最大为50"
)
@NotBlank
private
String
pid
;
private
String
pid
;
/*课程url*/
/*课程url*/
@Length
(
min
=
1
,
max
=
64
,
message
=
"长度最小为1,最大为50"
)
@NotBlank
private
String
chapterUrl
;
private
String
chapterUrl
;
/**任务书*/
/**任务书*/
private
String
mdFile
;
private
String
mdFile
;
/*1:实验 2:视频 3:PPT*/
/*1:实验 2:视频 3:PPT*/
@Length
(
min
=
1
,
max
=
20
,
message
=
"长度最小为1,最大为15"
)
@NotBlank
private
String
isTest
;
private
String
isTest
;
/*课程或开课 0:开课 1:课程*/
/*课程或开课 0:开课 1:课程*/
...
@@ -54,9 +64,13 @@ public class BChapter extends IdEntity<BChapter> {
...
@@ -54,9 +64,13 @@ public class BChapter extends IdEntity<BChapter> {
private
String
state
;
private
String
state
;
/*课程ID*/
/*课程ID*/
@Length
(
min
=
1
,
max
=
64
,
message
=
"长度最小为1,最大为50"
)
@NotBlank
private
String
lessonId
;
private
String
lessonId
;
/*课时*/
/*课时*/
@Length
(
min
=
1
,
max
=
8
,
message
=
"长度最小为1,最大为8"
)
@NotBlank
private
String
classHour
;
private
String
classHour
;
/*是否智评 0否 1是*/
/*是否智评 0否 1是*/
...
...
src/main/java/org/rcisoft/business/bclass/controller/BClassController.java
View file @
d3df9088
...
@@ -43,9 +43,9 @@ public class BClassController extends PaginationController<BClass> {
...
@@ -43,9 +43,9 @@ public class BClassController extends PaginationController<BClass> {
@ApiOperation
(
value
=
"添加/编辑班级"
,
notes
=
"businessId为空时是添加方法,不为空时是修改方法"
)
@ApiOperation
(
value
=
"添加/编辑班级"
,
notes
=
"businessId为空时是添加方法,不为空时是修改方法"
)
@ApiImplicitParams
({
@ApiImplicitParam
(
name
=
"businessId"
,
value
=
"businessId"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParams
({
@ApiImplicitParam
(
name
=
"businessId"
,
value
=
"businessId"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"code"
,
value
=
"班级编号"
,
required
=
true
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"code"
,
value
=
"班级编号
(1-50)
"
,
required
=
true
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"className"
,
value
=
"班级名称"
,
required
=
true
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"className"
,
value
=
"班级名称
(1-150)
"
,
required
=
true
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"studentNum"
,
value
=
"学生数量"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"studentNum"
,
value
=
"学生数量
(1-3)
"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"remarks"
,
value
=
"备注"
,
required
=
false
,
dataType
=
"varchar"
)})
@ApiImplicitParam
(
name
=
"remarks"
,
value
=
"备注"
,
required
=
false
,
dataType
=
"varchar"
)})
@PreAuthorize
(
"hasRole('ROLE_1001')"
)
@PreAuthorize
(
"hasRole('ROLE_1001')"
)
@PostMapping
(
value
=
"/add"
)
@PostMapping
(
value
=
"/add"
)
...
...
src/main/java/org/rcisoft/business/bclass/entity/BClass.java
View file @
d3df9088
...
@@ -4,6 +4,7 @@ import lombok.AllArgsConstructor;
...
@@ -4,6 +4,7 @@ import lombok.AllArgsConstructor;
import
lombok.Data
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
import
lombok.NoArgsConstructor
;
import
org.hibernate.validator.constraints.Length
;
import
org.hibernate.validator.constraints.Length
;
import
org.hibernate.validator.constraints.NotBlank
;
import
org.rcisoft.core.entity.IdEntity
;
import
org.rcisoft.core.entity.IdEntity
;
import
javax.persistence.Entity
;
import
javax.persistence.Entity
;
...
@@ -22,13 +23,18 @@ public class BClass extends IdEntity<BClass> {
...
@@ -22,13 +23,18 @@ public class BClass extends IdEntity<BClass> {
/*班级编号*/
/*班级编号*/
@Length
(
min
=
1
,
max
=
64
,
message
=
"长度最小为1,最大为50"
)
@NotBlank
private
String
code
;
private
String
code
;
/*班级名称*/
/*班级名称*/
@Length
(
min
=
1
,
max
=
50
,
message
=
"长度最小为1,最大为50"
)
@Length
(
min
=
1
,
max
=
200
,
message
=
"长度最小为1,最大为150"
)
@NotBlank
(
message
=
"不能含有空格"
)
private
String
className
;
private
String
className
;
/*学生数量,默认为0*/
/*学生数量,默认为0*/
@Length
(
min
=
1
,
max
=
3
,
message
=
"长度最小为1,最大为3"
)
@NotBlank
private
String
studentNum
;
private
String
studentNum
;
public
BClass
(
String
code
)
{
public
BClass
(
String
code
)
{
...
...
src/main/java/org/rcisoft/business/bdirection/controller/BDirectionController.java
View file @
d3df9088
...
@@ -33,8 +33,8 @@ public class BDirectionController extends PaginationController<BDirection> {
...
@@ -33,8 +33,8 @@ public class BDirectionController extends PaginationController<BDirection> {
@ApiOperation
(
value
=
"添加/编辑课程方向"
,
notes
=
"businessId为空时是添加方法,不为空时是修改方法"
)
@ApiOperation
(
value
=
"添加/编辑课程方向"
,
notes
=
"businessId为空时是添加方法,不为空时是修改方法"
)
@ApiImplicitParams
({
@ApiImplicitParam
(
name
=
"businessId"
,
value
=
"businessId"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParams
({
@ApiImplicitParam
(
name
=
"businessId"
,
value
=
"businessId"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"code"
,
value
=
"编号"
,
required
=
true
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"code"
,
value
=
"编号
(1-50)
"
,
required
=
true
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"name"
,
value
=
"名称"
,
required
=
true
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"name"
,
value
=
"名称
(1-50)
"
,
required
=
true
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"remarks"
,
value
=
"备注"
,
required
=
false
,
dataType
=
"varchar"
)})
@ApiImplicitParam
(
name
=
"remarks"
,
value
=
"备注"
,
required
=
false
,
dataType
=
"varchar"
)})
@PostMapping
(
value
=
"/add"
)
@PostMapping
(
value
=
"/add"
)
@PreAuthorize
(
"hasRole('ROLE_1001')"
)
@PreAuthorize
(
"hasRole('ROLE_1001')"
)
...
...
src/main/java/org/rcisoft/business/bdirection/entity/BDirection.java
View file @
d3df9088
...
@@ -4,6 +4,8 @@ package org.rcisoft.business.bdirection.entity;
...
@@ -4,6 +4,8 @@ package org.rcisoft.business.bdirection.entity;
import
lombok.AllArgsConstructor
;
import
lombok.AllArgsConstructor
;
import
lombok.Data
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
import
lombok.NoArgsConstructor
;
import
org.hibernate.validator.constraints.Length
;
import
org.hibernate.validator.constraints.NotBlank
;
import
org.rcisoft.core.entity.IdEntity
;
import
org.rcisoft.core.entity.IdEntity
;
import
javax.persistence.Entity
;
import
javax.persistence.Entity
;
...
@@ -20,8 +22,11 @@ import javax.persistence.Table;
...
@@ -20,8 +22,11 @@ import javax.persistence.Table;
public
class
BDirection
extends
IdEntity
<
BDirection
>
{
public
class
BDirection
extends
IdEntity
<
BDirection
>
{
private
static
final
long
serialVersionUID
=
-
7918359689093194816L
;
private
static
final
long
serialVersionUID
=
-
7918359689093194816L
;
@Length
(
min
=
1
,
max
=
64
,
message
=
"长度最小为1,最大为50"
)
@NotBlank
private
String
code
;
private
String
code
;
@Length
(
min
=
1
,
max
=
64
,
message
=
"长度最小为1,最大为50"
)
@NotBlank
private
String
name
;
private
String
name
;
public
BDirection
(
String
code
)
{
public
BDirection
(
String
code
)
{
...
...
src/main/java/org/rcisoft/business/bfile/controller/BFileController.java
View file @
d3df9088
...
@@ -38,8 +38,8 @@ public class BFileController extends PaginationController<BFile> {
...
@@ -38,8 +38,8 @@ public class BFileController extends PaginationController<BFile> {
@ApiOperation
(
value
=
"添加/编辑视频"
,
notes
=
"businessId为空时是添加方法,不为空时是修改方法"
)
@ApiOperation
(
value
=
"添加/编辑视频"
,
notes
=
"businessId为空时是添加方法,不为空时是修改方法"
)
@ApiImplicitParams
({
@ApiImplicitParam
(
name
=
"businessId"
,
value
=
"businessId"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParams
({
@ApiImplicitParam
(
name
=
"businessId"
,
value
=
"businessId"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"videoName"
,
value
=
"视频名称"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"videoName"
,
value
=
"视频名称
(1-200)
"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"videoUrl"
,
value
=
"视频地址"
,
required
=
true
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"videoUrl"
,
value
=
"视频地址
(1-200)
"
,
required
=
true
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"type"
,
value
=
"'0'为视频,'1'为附件"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"type"
,
value
=
"'0'为视频,'1'为附件"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"remarks"
,
value
=
"备注"
,
required
=
false
,
dataType
=
"varchar"
)})
@ApiImplicitParam
(
name
=
"remarks"
,
value
=
"备注"
,
required
=
false
,
dataType
=
"varchar"
)})
@PreAuthorize
(
"hasRole('ROLE_1002')"
)
@PreAuthorize
(
"hasRole('ROLE_1002')"
)
...
...
src/main/java/org/rcisoft/business/bfile/entity/BFile.java
View file @
d3df9088
...
@@ -3,6 +3,8 @@ package org.rcisoft.business.bfile.entity;
...
@@ -3,6 +3,8 @@ package org.rcisoft.business.bfile.entity;
import
lombok.AllArgsConstructor
;
import
lombok.AllArgsConstructor
;
import
lombok.Data
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
import
lombok.NoArgsConstructor
;
import
org.hibernate.validator.constraints.Length
;
import
org.hibernate.validator.constraints.NotBlank
;
import
org.rcisoft.core.entity.IdEntity
;
import
org.rcisoft.core.entity.IdEntity
;
import
javax.persistence.Entity
;
import
javax.persistence.Entity
;
...
@@ -21,24 +23,40 @@ public class BFile extends IdEntity<BFile> {
...
@@ -21,24 +23,40 @@ public class BFile extends IdEntity<BFile> {
private
static
final
long
serialVersionUID
=
5501554322621964535L
;
private
static
final
long
serialVersionUID
=
5501554322621964535L
;
/*视频名称*/
/*视频名称*/
@Length
(
min
=
1
,
max
=
256
,
message
=
"长度最小为1,最大为200"
)
@NotBlank
private
String
videoName
;
private
String
videoName
;
/*视频地址*/
/*视频地址*/
@Length
(
min
=
1
,
max
=
256
,
message
=
"长度最小为1,最大为200"
)
@NotBlank
private
String
videoUrl
;
private
String
videoUrl
;
/*'0'为视频,'1'为附件*/
/*'0'为视频,'1'为附件*/
private
String
type
;
private
String
type
;
@Length
(
min
=
1
,
max
=
256
,
message
=
"长度最小为1,最大为200"
)
@NotBlank
private
String
fileUrl
;
private
String
fileUrl
;
@Length
(
min
=
1
,
max
=
256
,
message
=
"长度最小为1,最大为200"
)
@NotBlank
private
String
pptUrl
;
private
String
pptUrl
;
@Length
(
min
=
1
,
max
=
256
,
message
=
"长度最小为1,最大为200"
)
@NotBlank
private
String
pdfUrl
;
private
String
pdfUrl
;
@Length
(
min
=
1
,
max
=
64
,
message
=
"长度最小为1,最大为50"
)
@NotBlank
private
String
lessonId
;
//课程ID
private
String
lessonId
;
//课程ID
@Length
(
min
=
1
,
max
=
64
,
message
=
"长度最小为1,最大为50"
)
@NotBlank
private
String
slId
;
//开课ID
private
String
slId
;
//开课ID
@Length
(
min
=
1
,
max
=
64
,
message
=
"长度最小为1,最大为50"
)
@NotBlank
private
String
chapterId
;
//节ID
private
String
chapterId
;
//节ID
}
}
src/main/java/org/rcisoft/business/bimage/controller/BImageController.java
View file @
d3df9088
...
@@ -26,8 +26,8 @@ public class BImageController extends PaginationController<BImage> {
...
@@ -26,8 +26,8 @@ public class BImageController extends PaginationController<BImage> {
@ApiOperation
(
value
=
"添加/编辑图片"
,
notes
=
"businessId为空时是添加方法,不为空时是修改方法"
)
@ApiOperation
(
value
=
"添加/编辑图片"
,
notes
=
"businessId为空时是添加方法,不为空时是修改方法"
)
@ApiImplicitParams
({
@ApiImplicitParam
(
name
=
"businessId"
,
value
=
"businessId"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParams
({
@ApiImplicitParam
(
name
=
"businessId"
,
value
=
"businessId"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"imageName"
,
value
=
"图片标题"
,
required
=
true
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"imageName"
,
value
=
"图片标题
(1-50)
"
,
required
=
true
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"imageCode"
,
value
=
"图片code"
,
required
=
true
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"imageCode"
,
value
=
"图片code
(1-50)
"
,
required
=
true
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"remarks"
,
value
=
"备注"
,
required
=
false
,
dataType
=
"varchar"
)})
@ApiImplicitParam
(
name
=
"remarks"
,
value
=
"备注"
,
required
=
false
,
dataType
=
"varchar"
)})
@PreAuthorize
(
"hasRole('ROLE_1001')"
)
@PreAuthorize
(
"hasRole('ROLE_1001')"
)
@PostMapping
(
value
=
"/add"
)
@PostMapping
(
value
=
"/add"
)
...
...
src/main/java/org/rcisoft/business/bimage/entity/BImage.java
View file @
d3df9088
...
@@ -4,6 +4,8 @@ package org.rcisoft.business.bimage.entity;
...
@@ -4,6 +4,8 @@ package org.rcisoft.business.bimage.entity;
import
lombok.AllArgsConstructor
;
import
lombok.AllArgsConstructor
;
import
lombok.Data
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
import
lombok.NoArgsConstructor
;
import
org.hibernate.validator.constraints.Length
;
import
org.hibernate.validator.constraints.NotBlank
;
import
org.rcisoft.core.entity.IdEntity
;
import
org.rcisoft.core.entity.IdEntity
;
import
javax.persistence.Entity
;
import
javax.persistence.Entity
;
...
@@ -25,9 +27,13 @@ public class BImage extends IdEntity<BImage> {
...
@@ -25,9 +27,13 @@ public class BImage extends IdEntity<BImage> {
}
}
/*图片标题*/
/*图片标题*/
@Length
(
min
=
1
,
max
=
64
,
message
=
"长度最小为1,最大为50"
)
@NotBlank
private
String
imageName
;
private
String
imageName
;
/*图片code*/
/*图片code*/
@Length
(
min
=
1
,
max
=
64
,
message
=
"长度最小为1,最大为50"
)
@NotBlank
private
String
imageCode
;
private
String
imageCode
;
}
}
...
...
src/main/java/org/rcisoft/business/blesson/controller/BLessonController.java
View file @
d3df9088
...
@@ -43,10 +43,10 @@ public class BLessonController extends PaginationController<BLesson> {
...
@@ -43,10 +43,10 @@ public class BLessonController extends PaginationController<BLesson> {
@ApiOperation
(
value
=
"添加/编辑课程"
,
notes
=
"businessId为空时是添加方法,不为空时是修改方法"
)
@ApiOperation
(
value
=
"添加/编辑课程"
,
notes
=
"businessId为空时是添加方法,不为空时是修改方法"
)
@ApiImplicitParams
({
@ApiImplicitParam
(
name
=
"businessId"
,
value
=
"businessId"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParams
({
@ApiImplicitParam
(
name
=
"businessId"
,
value
=
"businessId"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"code"
,
value
=
"课程编号"
,
required
=
true
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"code"
,
value
=
"课程编号
(1-50)
"
,
required
=
true
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"lessonName"
,
value
=
"课程名称"
,
required
=
true
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"lessonName"
,
value
=
"课程名称
(1-150)
"
,
required
=
true
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"classHour"
,
value
=
"课时"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"classHour"
,
value
=
"课时
(1-5)
"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"credits"
,
value
=
"学分"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"credits"
,
value
=
"学分
(1-5)
"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"directionId"
,
value
=
"课程方向ID"
,
required
=
false
,
dataType
=
"varchar"
)})
@ApiImplicitParam
(
name
=
"directionId"
,
value
=
"课程方向ID"
,
required
=
false
,
dataType
=
"varchar"
)})
@PostMapping
(
value
=
"/add"
)
@PostMapping
(
value
=
"/add"
)
@PreAuthorize
(
"hasRole('ROLE_1001')"
)
@PreAuthorize
(
"hasRole('ROLE_1001')"
)
...
...
src/main/java/org/rcisoft/business/blesson/entity/BLesson.java
View file @
d3df9088
...
@@ -4,6 +4,7 @@ import lombok.AllArgsConstructor;
...
@@ -4,6 +4,7 @@ import lombok.AllArgsConstructor;
import
lombok.Data
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
import
lombok.NoArgsConstructor
;
import
org.hibernate.validator.constraints.Length
;
import
org.hibernate.validator.constraints.Length
;
import
org.hibernate.validator.constraints.NotBlank
;
import
org.rcisoft.core.entity.IdEntity
;
import
org.rcisoft.core.entity.IdEntity
;
import
javax.persistence.Entity
;
import
javax.persistence.Entity
;
...
@@ -22,15 +23,20 @@ public class BLesson extends IdEntity<BLesson> {
...
@@ -22,15 +23,20 @@ public class BLesson extends IdEntity<BLesson> {
private
static
final
long
serialVersionUID
=
-
4327021174023243830L
;
private
static
final
long
serialVersionUID
=
-
4327021174023243830L
;
/*课程编号*/
/*课程编号*/
@NotBlank
@Length
(
min
=
1
,
max
=
64
,
message
=
"长度最小为1,最大为50"
)
private
String
code
;
private
String
code
;
/*课程名称*/
/*课程名称*/
@Length
(
min
=
1
,
max
=
50
,
message
=
"长度最小为1,最大为50"
)
@NotBlank
@Length
(
min
=
1
,
max
=
200
,
message
=
"长度最小为1,最大为150"
)
private
String
lessonName
;
private
String
lessonName
;
/*默认封面图片url*/
/*默认封面图片url*/
private
String
defaultUrl
;
private
String
defaultUrl
;
@Length
(
min
=
1
,
max
=
8
,
message
=
"长度最小为1,最大为5"
)
private
String
classHour
;
//课时
private
String
classHour
;
//课时
@Length
(
min
=
1
,
max
=
8
,
message
=
"长度最小为1,最大为5"
)
private
String
credits
;
//学分
private
String
credits
;
//学分
@Transient
@Transient
...
...
src/main/java/org/rcisoft/business/blesson/entity/BLessonDirection.java
View file @
d3df9088
...
@@ -3,6 +3,8 @@ package org.rcisoft.business.blesson.entity;
...
@@ -3,6 +3,8 @@ package org.rcisoft.business.blesson.entity;
import
lombok.AllArgsConstructor
;
import
lombok.AllArgsConstructor
;
import
lombok.Data
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
import
lombok.NoArgsConstructor
;
import
org.hibernate.validator.constraints.Length
;
import
org.hibernate.validator.constraints.NotBlank
;
import
javax.persistence.Entity
;
import
javax.persistence.Entity
;
import
javax.persistence.Table
;
import
javax.persistence.Table
;
...
@@ -16,12 +18,16 @@ import javax.persistence.Table;
...
@@ -16,12 +18,16 @@ import javax.persistence.Table;
@NoArgsConstructor
@NoArgsConstructor
@AllArgsConstructor
@AllArgsConstructor
public
class
BLessonDirection
{
public
class
BLessonDirection
{
@Length
(
min
=
1
,
max
=
64
,
message
=
"长度最小为1,最大为50"
)
@NotBlank
private
String
businessId
;
private
String
businessId
;
@Length
(
min
=
1
,
max
=
64
,
message
=
"长度最小为1,最大为50"
)
@NotBlank
private
String
lessionId
;
private
String
lessionId
;
@Length
(
min
=
1
,
max
=
64
,
message
=
"长度最小为1,最大为50"
)
@NotBlank
private
String
directionId
;
private
String
directionId
;
@Length
(
min
=
1
,
max
=
64
,
message
=
"长度最小为1,最大为50"
)
@NotBlank
private
String
slId
;
private
String
slId
;
}
}
src/main/java/org/rcisoft/business/bnews/controller/BNewsController.java
View file @
d3df9088
...
@@ -33,8 +33,8 @@ public class BNewsController extends PaginationController<BNews> {
...
@@ -33,8 +33,8 @@ public class BNewsController extends PaginationController<BNews> {
@ApiOperation
(
value
=
"添加/编辑新闻"
,
notes
=
"businessId为空时是添加方法,不为空时是修改方法"
)
@ApiOperation
(
value
=
"添加/编辑新闻"
,
notes
=
"businessId为空时是添加方法,不为空时是修改方法"
)
@ApiImplicitParams
({
@ApiImplicitParam
(
name
=
"businessId"
,
value
=
"businessId"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParams
({
@ApiImplicitParam
(
name
=
"businessId"
,
value
=
"businessId"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"newsName"
,
value
=
"新闻标题"
,
required
=
true
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"newsName"
,
value
=
"新闻标题
(1-50)
"
,
required
=
true
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"newsCode"
,
value
=
"新闻code"
,
required
=
true
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"newsCode"
,
value
=
"新闻code
(1-50)
"
,
required
=
true
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"releaseTime"
,
value
=
"发布时间"
,
required
=
false
,
dataType
=
"datetime"
),
@ApiImplicitParam
(
name
=
"releaseTime"
,
value
=
"发布时间"
,
required
=
false
,
dataType
=
"datetime"
),
@ApiImplicitParam
(
name
=
"attribute"
,
value
=
"0:非头条,1:头条"
,
required
=
true
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"attribute"
,
value
=
"0:非头条,1:头条"
,
required
=
true
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"isRelease"
,
value
=
"0未发布,1:发布"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"isRelease"
,
value
=
"0未发布,1:发布"
,
required
=
false
,
dataType
=
"varchar"
),
...
...
src/main/java/org/rcisoft/business/bnews/entity/BNews.java
View file @
d3df9088
...
@@ -4,6 +4,7 @@ import lombok.AllArgsConstructor;
...
@@ -4,6 +4,7 @@ import lombok.AllArgsConstructor;
import
lombok.Data
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
import
lombok.NoArgsConstructor
;
import
org.hibernate.validator.constraints.Length
;
import
org.hibernate.validator.constraints.Length
;
import
org.hibernate.validator.constraints.NotBlank
;
import
org.rcisoft.core.entity.IdEntity
;
import
org.rcisoft.core.entity.IdEntity
;
import
javax.persistence.Entity
;
import
javax.persistence.Entity
;
...
@@ -53,8 +54,11 @@ public class BNews extends IdEntity<BNews> {
...
@@ -53,8 +54,11 @@ public class BNews extends IdEntity<BNews> {
/*新闻标题*/
/*新闻标题*/
@Length
(
min
=
1
,
max
=
50
,
message
=
"长度最小为1,最大为50"
)
@Length
(
min
=
1
,
max
=
50
,
message
=
"长度最小为1,最大为50"
)
@NotBlank
private
String
newsName
;
private
String
newsName
;
/*新闻code*/
/*新闻code*/
@Length
(
min
=
1
,
max
=
64
,
message
=
"长度最小为1,最大为50"
)
@NotBlank
private
String
newsCode
;
private
String
newsCode
;
/*发布时间*/
/*发布时间*/
private
Date
releaseTime
;
private
Date
releaseTime
;
...
...
src/main/java/org/rcisoft/business/bopinion/controller/BOpinionController.java
View file @
d3df9088
...
@@ -28,7 +28,9 @@ public class BOpinionController extends PaginationController<BOpinion> {
...
@@ -28,7 +28,9 @@ public class BOpinionController extends PaginationController<BOpinion> {
private
BOpinionService
bOpinionService
;
private
BOpinionService
bOpinionService
;
@ApiOperation
(
value
=
"查询历史审批意见"
,
notes
=
"根据开课ID查询历史审批意见"
)
@ApiOperation
(
value
=
"查询历史审批意见"
,
notes
=
"根据开课ID查询历史审批意见"
)
@ApiImplicitParam
(
name
=
"slId"
,
value
=
"开课ID"
,
required
=
true
,
dataType
=
"varchar"
)
@ApiImplicitParams
({
@ApiImplicitParam
(
name
=
"slId"
,
value
=
"开课ID(1-50)"
,
required
=
true
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"opinion"
,
value
=
"意见(1-200)"
,
required
=
false
,
dataType
=
"varchar"
),})
@GetMapping
(
value
=
"/queryOpinionBySlId"
)
@GetMapping
(
value
=
"/queryOpinionBySlId"
)
private
Result
queryOpinionBySlId
(
String
slId
){
private
Result
queryOpinionBySlId
(
String
slId
){
List
<
BOpinion
>
data
=
bOpinionService
.
queryOpinionBySlId
(
slId
);
List
<
BOpinion
>
data
=
bOpinionService
.
queryOpinionBySlId
(
slId
);
...
...
src/main/java/org/rcisoft/business/bopinion/entity/BOpinion.java
View file @
d3df9088
...
@@ -3,6 +3,8 @@ package org.rcisoft.business.bopinion.entity;
...
@@ -3,6 +3,8 @@ package org.rcisoft.business.bopinion.entity;
import
lombok.AllArgsConstructor
;
import
lombok.AllArgsConstructor
;
import
lombok.Data
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
import
lombok.NoArgsConstructor
;
import
org.hibernate.validator.constraints.Length
;
import
org.hibernate.validator.constraints.NotBlank
;
import
javax.persistence.Entity
;
import
javax.persistence.Entity
;
import
javax.persistence.Table
;
import
javax.persistence.Table
;
...
@@ -18,12 +20,15 @@ import java.util.Date;
...
@@ -18,12 +20,15 @@ import java.util.Date;
@NoArgsConstructor
@NoArgsConstructor
@AllArgsConstructor
@AllArgsConstructor
public
class
BOpinion
{
public
class
BOpinion
{
@Length
(
min
=
1
,
max
=
64
,
message
=
"长度最小为1,最大为50"
)
@NotBlank
private
String
businessId
;
private
String
businessId
;
@Length
(
min
=
1
,
max
=
255
,
message
=
"长度最小为1,最大为200"
)
@NotBlank
private
String
opinion
;
private
String
opinion
;
private
Date
createDate
;
private
Date
createDate
;
@Length
(
min
=
1
,
max
=
64
,
message
=
"长度最小为1,最大为50"
)
@NotBlank
private
String
slId
;
private
String
slId
;
}
}
src/main/java/org/rcisoft/business/brclassstudent/controller/BRClassStudentController.java
View file @
d3df9088
...
@@ -29,9 +29,9 @@ public class BRClassStudentController extends PaginationController<BRClassStuden
...
@@ -29,9 +29,9 @@ public class BRClassStudentController extends PaginationController<BRClassStuden
@ApiOperation
(
value
=
"添加/编辑学生班级中间表信息"
,
notes
=
"businessId为空时是添加方法,不为空时是修改方法"
)
@ApiOperation
(
value
=
"添加/编辑学生班级中间表信息"
,
notes
=
"businessId为空时是添加方法,不为空时是修改方法"
)
@ApiImplicitParams
({
@ApiImplicitParam
(
name
=
"businessId"
,
value
=
"businessId"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParams
({
@ApiImplicitParam
(
name
=
"businessId"
,
value
=
"businessId
(1-50)
"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"classCode"
,
value
=
"班级编号"
,
required
=
true
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"classCode"
,
value
=
"班级编号
(1-50)
"
,
required
=
true
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"studentCode"
,
value
=
"学生编号"
,
required
=
true
,
dataType
=
"varchar"
)})
@ApiImplicitParam
(
name
=
"studentCode"
,
value
=
"学生编号
(1-50)
"
,
required
=
true
,
dataType
=
"varchar"
)})
@PreAuthorize
(
"hasRole('ROLE_1001')"
)
@PreAuthorize
(
"hasRole('ROLE_1001')"
)
@PostMapping
(
value
=
"/add"
)
@PostMapping
(
value
=
"/add"
)
public
Result
add
(
BRClassStudent
bRClassStudent
)
{
public
Result
add
(
BRClassStudent
bRClassStudent
)
{
...
...
src/main/java/org/rcisoft/business/brclassstudent/entity/BRClassStudent.java
View file @
d3df9088
...
@@ -3,6 +3,8 @@ package org.rcisoft.business.brclassstudent.entity;
...
@@ -3,6 +3,8 @@ package org.rcisoft.business.brclassstudent.entity;
import
lombok.AllArgsConstructor
;
import
lombok.AllArgsConstructor
;
import
lombok.Data
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
import
lombok.NoArgsConstructor
;
import
org.hibernate.validator.constraints.Length
;
import
org.hibernate.validator.constraints.NotBlank
;
import
org.rcisoft.core.util.IdGen
;
import
org.rcisoft.core.util.IdGen
;
import
javax.persistence.Entity
;
import
javax.persistence.Entity
;
...
@@ -27,10 +29,16 @@ public class BRClassStudent {
...
@@ -27,10 +29,16 @@ public class BRClassStudent {
}
}
@Id
@Id
@Length
(
min
=
1
,
max
=
64
,
message
=
"长度最小为1,最大为50"
)
@NotBlank
protected
String
businessId
;
protected
String
businessId
;
/*班级编号*/
/*班级编号*/
@Length
(
min
=
1
,
max
=
64
,
message
=
"长度最小为1,最大为50"
)
@NotBlank
private
String
classCode
;
private
String
classCode
;
/*学生编号*/
/*学生编号*/
@Length
(
min
=
1
,
max
=
64
,
message
=
"长度最小为1,最大为50"
)
@NotBlank
private
String
studentCode
;
private
String
studentCode
;
...
...
src/main/java/org/rcisoft/business/brslstudent/controller/BRSlStudentController.java
View file @
d3df9088
...
@@ -28,9 +28,9 @@ public class BRSlStudentController extends PaginationController<BRSlStudent> {
...
@@ -28,9 +28,9 @@ public class BRSlStudentController extends PaginationController<BRSlStudent> {
private
BRSlStudentService
bRSlStudentService
;
private
BRSlStudentService
bRSlStudentService
;
@ApiOperation
(
value
=
"添加/编辑学生课程中间表信息"
,
notes
=
"businessId为空时是添加方法,不为空时是修改方法"
)
@ApiOperation
(
value
=
"添加/编辑学生课程中间表信息"
,
notes
=
"businessId为空时是添加方法,不为空时是修改方法"
)
@ApiImplicitParams
({
@ApiImplicitParam
(
name
=
"businessId"
,
value
=
"businessId"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParams
({
@ApiImplicitParam
(
name
=
"businessId"
,
value
=
"businessId
(1-50)
"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"slCode"
,
value
=
"课程编号"
,
required
=
true
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"slCode"
,
value
=
"课程编号
(1-50)
"
,
required
=
true
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"studentCode"
,
value
=
"学生编号"
,
required
=
true
,
dataType
=
"varchar"
)})
@ApiImplicitParam
(
name
=
"studentCode"
,
value
=
"学生编号
(1-50)
"
,
required
=
true
,
dataType
=
"varchar"
)})
@PreAuthorize
(
"hasRole('ROLE_1001')"
)
@PreAuthorize
(
"hasRole('ROLE_1001')"
)
@PostMapping
(
value
=
"/add"
)
@PostMapping
(
value
=
"/add"
)
public
Result
add
(
BRSlStudent
bRSlStudent
)
{
public
Result
add
(
BRSlStudent
bRSlStudent
)
{
...
...
src/main/java/org/rcisoft/business/brslstudent/entity/BRSlStudent.java
View file @
d3df9088
...
@@ -3,6 +3,8 @@ package org.rcisoft.business.brslstudent.entity;
...
@@ -3,6 +3,8 @@ package org.rcisoft.business.brslstudent.entity;
import
lombok.AllArgsConstructor
;
import
lombok.AllArgsConstructor
;
import
lombok.Data
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
import
lombok.NoArgsConstructor
;
import
org.hibernate.validator.constraints.Length
;
import
org.hibernate.validator.constraints.NotBlank
;
import
javax.persistence.Entity
;
import
javax.persistence.Entity
;
import
javax.persistence.Table
;
import
javax.persistence.Table
;
...
@@ -22,13 +24,18 @@ public class BRSlStudent {
...
@@ -22,13 +24,18 @@ public class BRSlStudent {
this
.
studentCode
=
studentCode
;
this
.
studentCode
=
studentCode
;
this
.
slCode
=
slCode
;
this
.
slCode
=
slCode
;
}
}
@Length
(
min
=
1
,
max
=
64
,
message
=
"长度最小为1,最大为50"
)
@NotBlank
private
String
businessId
;
private
String
businessId
;
/*学生编号*/
/*学生编号*/
@Length
(
min
=
1
,
max
=
64
,
message
=
"长度最小为1,最大为50"
)
@NotBlank
private
String
studentCode
;
private
String
studentCode
;
/*课程编号*/
/*课程编号*/
@Length
(
min
=
1
,
max
=
64
,
message
=
"长度最小为1,最大为50"
)
@NotBlank
private
String
slCode
;
private
String
slCode
;
@Transient
@Transient
...
...
src/main/java/org/rcisoft/business/bsl/controller/BSlController.java
View file @
d3df9088
...
@@ -41,12 +41,12 @@ public class BSlController extends PaginationController<BSl> {
...
@@ -41,12 +41,12 @@ public class BSlController extends PaginationController<BSl> {
@ApiOperation
(
value
=
"添加/编辑课程"
,
notes
=
"businessId为空时是添加方法,不为空时是修改方法"
)
@ApiOperation
(
value
=
"添加/编辑课程"
,
notes
=
"businessId为空时是添加方法,不为空时是修改方法"
)
@ApiImplicitParams
({
@ApiImplicitParam
(
name
=
"businessId"
,
value
=
"businessId"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParams
({
@ApiImplicitParam
(
name
=
"businessId"
,
value
=
"businessId"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"code"
,
value
=
"课序号"
,
required
=
true
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"code"
,
value
=
"课序号
(1-50)
"
,
required
=
true
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"lessonCode"
,
value
=
"课程编号"
,
required
=
true
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"lessonCode"
,
value
=
"课程编号
(1-50)
"
,
required
=
true
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"teacherCode"
,
value
=
"教师编号"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"teacherCode"
,
value
=
"教师编号
(1-50)
"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"termCode"
,
value
=
"学期编号"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"termCode"
,
value
=
"学期编号
(1-50)
"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"classHour"
,
value
=
"课时"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"classHour"
,
value
=
"课时
(1-8)
"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"credits"
,
value
=
"学分"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"credits"
,
value
=
"学分
(1-8)
"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"directionId"
,
value
=
"课程方向ID"
,
required
=
false
,
dataType
=
"varchar"
)})
@ApiImplicitParam
(
name
=
"directionId"
,
value
=
"课程方向ID"
,
required
=
false
,
dataType
=
"varchar"
)})
@PreAuthorize
(
"hasRole('ROLE_1001')"
)
@PreAuthorize
(
"hasRole('ROLE_1001')"
)
@PostMapping
(
value
=
"/add"
)
@PostMapping
(
value
=
"/add"
)
...
...
src/main/java/org/rcisoft/business/bsl/entity/BSl.java
View file @
d3df9088
...
@@ -4,6 +4,7 @@ import lombok.AllArgsConstructor;
...
@@ -4,6 +4,7 @@ import lombok.AllArgsConstructor;
import
lombok.Data
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
import
lombok.NoArgsConstructor
;
import
org.hibernate.validator.constraints.Length
;
import
org.hibernate.validator.constraints.Length
;
import
org.hibernate.validator.constraints.NotBlank
;
import
org.rcisoft.core.entity.IdEntity
;
import
org.rcisoft.core.entity.IdEntity
;
import
javax.persistence.Entity
;
import
javax.persistence.Entity
;
...
@@ -35,12 +36,21 @@ public class BSl extends IdEntity<BSl> {
...
@@ -35,12 +36,21 @@ public class BSl extends IdEntity<BSl> {
this
.
delFlag
=
delFlag
;
this
.
delFlag
=
delFlag
;
this
.
flag
=
flag
;
this
.
flag
=
flag
;
}
}
@Length
(
min
=
1
,
max
=
64
,
message
=
"长度最小为1,最大为50"
)
@NotBlank
private
String
code
;
//课序号
private
String
code
;
//课序号
@Length
(
min
=
1
,
max
=
64
,
message
=
"长度最小为1,最大为50"
)
@NotBlank
private
String
lessonCode
;
//课程编号
private
String
lessonCode
;
//课程编号
@Length
(
min
=
1
,
max
=
64
,
message
=
"长度最小为1,最大为50"
)
@NotBlank
private
String
teacherCode
;
//教师编号
private
String
teacherCode
;
//教师编号
@Length
(
min
=
1
,
max
=
64
,
message
=
"长度最小为1,最大为50"
)
@NotBlank
private
String
termCode
;
//学期编号
private
String
termCode
;
//学期编号
//private String isOnline;//是否上线,(0:待上线,1:已上线,2:已下线)
//private String isOnline;//是否上线,(0:待上线,1:已上线,2:已下线)
@Length
(
min
=
1
,
max
=
128
,
message
=
"长度最小为1,最大为100"
)
@NotBlank
private
String
slCoverUrl
;
//课程封面
private
String
slCoverUrl
;
//课程封面
@Length
(
min
=
1
,
max
=
200
,
message
=
"长度最小为1,最大为200"
)
@Length
(
min
=
1
,
max
=
200
,
message
=
"长度最小为1,最大为200"
)
private
String
slNotes
;
//课程简介
private
String
slNotes
;
//课程简介
...
@@ -48,15 +58,19 @@ public class BSl extends IdEntity<BSl> {
...
@@ -48,15 +58,19 @@ public class BSl extends IdEntity<BSl> {
private
Date
recommendDate
;
//推荐日期
private
Date
recommendDate
;
//推荐日期
private
Integer
recommendOrder
;
//推荐序号
private
Integer
recommendOrder
;
//推荐序号
@Length
(
min
=
1
,
max
=
2
00
,
message
=
"长度最小为1,最大为200"
)
@Length
(
min
=
1
,
max
=
2
56
,
message
=
"长度最小为1,最大为200"
)
private
String
recommendCourse
;
//推荐原因
private
String
recommendCourse
;
//推荐原因
@Length
(
min
=
1
,
max
=
32
,
message
=
"长度最小为1,最大为30"
)
@NotBlank
private
String
gitLabProjectId
;
//gitlab项目id
private
String
gitLabProjectId
;
//gitlab项目id
@Length
(
min
=
1
,
max
=
256
,
message
=
"长度最小为1,最大为200"
)
@NotBlank
private
String
gitLabProjectName
;
//gitlab项目名
private
String
gitLabProjectName
;
//gitlab项目名
@Length
(
min
=
1
,
max
=
8
,
message
=
"长度最小为1,最大为8"
)
@NotBlank
private
String
classHour
;
//课时
private
String
classHour
;
//课时
@Length
(
min
=
1
,
max
=
8
,
message
=
"长度最小为1,最大为8"
)
@NotBlank
private
String
credits
;
//学分
private
String
credits
;
//学分
private
String
auditStatus
;
//审核状态 0:待发布,1审核中,2已发布,3已驳回
private
String
auditStatus
;
//审核状态 0:待发布,1审核中,2已发布,3已驳回
...
...
src/main/java/org/rcisoft/business/bslapply/controller/BSlApplyController.java
View file @
d3df9088
...
@@ -38,13 +38,13 @@ public class BSlApplyController extends PaginationController<BSlApply> {
...
@@ -38,13 +38,13 @@ public class BSlApplyController extends PaginationController<BSlApply> {
@ApiOperation
(
value
=
"添加/编辑开课申请"
,
notes
=
"businessId为空时是添加方法,不为空时是修改方法"
)
@ApiOperation
(
value
=
"添加/编辑开课申请"
,
notes
=
"businessId为空时是添加方法,不为空时是修改方法"
)
@ApiImplicitParams
({
@ApiImplicitParam
(
name
=
"businessId"
,
value
=
"businessId"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParams
({
@ApiImplicitParam
(
name
=
"businessId"
,
value
=
"businessId"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"termCode"
,
value
=
"学期标号"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"termCode"
,
value
=
"学期标号
(1-50)
"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"slName"
,
value
=
"课程名称"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"slName"
,
value
=
"课程名称
(1-50)
"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"applyCourse"
,
value
=
"申请理由"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"applyCourse"
,
value
=
"申请理由"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"applyState"
,
value
=
"0申请中,1已通过,2已打回"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"applyState"
,
value
=
"0申请中,1已通过,2已打回"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"applyCode"
,
value
=
"申请单号"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"applyCode"
,
value
=
"申请单号
(1-50)
"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"teacherCode"
,
value
=
"教师编号"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"teacherCode"
,
value
=
"教师编号
(1-30)
"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"refuseCourse"
,
value
=
"拒绝原因"
,
required
=
false
,
dataType
=
"varchar"
)})
@ApiImplicitParam
(
name
=
"refuseCourse"
,
value
=
"拒绝原因
(1-150)
"
,
required
=
false
,
dataType
=
"varchar"
)})
@PreAuthorize
(
"hasRole('ROLE_1001')"
)
@PreAuthorize
(
"hasRole('ROLE_1001')"
)
@PostMapping
(
value
=
"/add"
)
@PostMapping
(
value
=
"/add"
)
public
Result
add
(
@Valid
ApplyFormDTO
applyFormDTO
,
public
Result
add
(
@Valid
ApplyFormDTO
applyFormDTO
,
...
...
src/main/java/org/rcisoft/business/bslapply/dto/ApplyFormDTO.java
View file @
d3df9088
package
org
.
rcisoft
.
business
.
bslapply
.
dto
;
package
org
.
rcisoft
.
business
.
bslapply
.
dto
;
import
lombok.Data
;
import
lombok.Data
;
import
org.hibernate.validator.constraints.Length
;
import
org.hibernate.validator.constraints.NotBlank
;
import
org.hibernate.validator.constraints.NotEmpty
;
import
org.hibernate.validator.constraints.NotEmpty
;
/**
/**
...
@@ -8,17 +10,24 @@ import org.hibernate.validator.constraints.NotEmpty;
...
@@ -8,17 +10,24 @@ import org.hibernate.validator.constraints.NotEmpty;
*/
*/
@Data
@Data
public
class
ApplyFormDTO
{
public
class
ApplyFormDTO
{
@Length
(
min
=
1
,
max
=
64
,
message
=
"长度最小为1,最大为50"
)
@NotBlank
@NotEmpty
(
message
=
"学期编号不能为空"
)
@NotEmpty
(
message
=
"学期编号不能为空"
)
private
String
termCode
;
private
String
termCode
;
@Length
(
min
=
1
,
max
=
64
,
message
=
"长度最小为1,最大为50"
)
@NotBlank
@NotEmpty
(
message
=
"课程名称不能为空"
)
@NotEmpty
(
message
=
"课程名称不能为空"
)
private
String
slName
;
private
String
slName
;
@NotEmpty
(
message
=
"申请理由不能为空"
)
@NotEmpty
(
message
=
"申请理由不能为空"
)
private
String
applyCourse
;
private
String
applyCourse
;
private
String
applyState
;
private
String
applyState
;
private
String
applyCode
;
private
String
applyCode
;
@Length
(
min
=
1
,
max
=
64
,
message
=
"长度最小为1,最大为50"
)
@NotBlank
@NotEmpty
(
message
=
"教师编号不能为空"
)
@NotEmpty
(
message
=
"教师编号不能为空"
)
private
String
teacherCode
;
private
String
teacherCode
;
@Length
(
min
=
1
,
max
=
200
,
message
=
"长度最小为1,最大为150"
)
@NotBlank
private
String
refuseCourse
;
private
String
refuseCourse
;
}
}
src/main/java/org/rcisoft/business/bslapply/entity/BSlApply.java
View file @
d3df9088
...
@@ -4,6 +4,7 @@ import lombok.AllArgsConstructor;
...
@@ -4,6 +4,7 @@ import lombok.AllArgsConstructor;
import
lombok.Data
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
import
lombok.NoArgsConstructor
;
import
org.hibernate.validator.constraints.Length
;
import
org.hibernate.validator.constraints.Length
;
import
org.hibernate.validator.constraints.NotBlank
;
import
org.rcisoft.core.entity.IdEntity
;
import
org.rcisoft.core.entity.IdEntity
;
import
javax.persistence.Entity
;
import
javax.persistence.Entity
;
...
@@ -28,20 +29,26 @@ public class BSlApply extends IdEntity<BSlApply> {
...
@@ -28,20 +29,26 @@ public class BSlApply extends IdEntity<BSlApply> {
/*学期标号*/
/*学期标号*/
@Length
(
min
=
1
,
max
=
64
,
message
=
"长度最小为1,最大为50"
)
@NotBlank
private
String
termCode
;
private
String
termCode
;
/*课程名称*/
/*课程名称*/
@Length
(
min
=
1
,
max
=
50
,
message
=
"长度最小为1,最大为50"
)
@Length
(
min
=
1
,
max
=
64
,
message
=
"长度最小为1,最大为50"
)
private
String
slName
;
private
String
slName
;
/*申请理由*/
/*申请理由*/
private
String
applyCourse
;
private
String
applyCourse
;
/*0申请中,1已通过,2已打回*/
/*0申请中,1已通过,2已打回*/
private
String
applyState
;
private
String
applyState
;
/*申请单号*/
/*申请单号*/
@Length
(
min
=
1
,
max
=
32
,
message
=
"长度最小为1,最大为30"
)
@NotBlank
private
String
applyCode
;
private
String
applyCode
;
/*教师编号*/
/*教师编号*/
@Length
(
min
=
1
,
max
=
32
,
message
=
"长度最小为1,最大为30"
)
@NotBlank
private
String
teacherCode
;
private
String
teacherCode
;
/*拒绝原因*/
/*拒绝原因*/
@Length
(
min
=
1
,
max
=
200
,
message
=
"长度最小为1,最大为
20
0"
)
@Length
(
min
=
1
,
max
=
200
,
message
=
"长度最小为1,最大为
15
0"
)
private
String
refuseCourse
;
private
String
refuseCourse
;
@Transient
@Transient
...
...
src/main/java/org/rcisoft/business/bstudent/controller/BStudentController.java
View file @
d3df9088
...
@@ -42,13 +42,14 @@ public class BStudentController extends PaginationController<BStudent> {
...
@@ -42,13 +42,14 @@ public class BStudentController extends PaginationController<BStudent> {
@ApiOperation
(
value
=
"添加/编辑学生信息"
,
notes
=
"businessId为空时是添加方法,不为空时是修改方法"
)
@ApiOperation
(
value
=
"添加/编辑学生信息"
,
notes
=
"businessId为空时是添加方法,不为空时是修改方法"
)
@ApiImplicitParams
({
@ApiImplicitParam
(
name
=
"businessId"
,
value
=
"businessId"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParams
({
@ApiImplicitParam
(
name
=
"businessId"
,
value
=
"businessId"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"code"
,
value
=
"学号"
,
required
=
true
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"code"
,
value
=
"学号
(8-11)
"
,
required
=
true
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"isRecommend"
,
value
=
"0:未推荐,1:推荐"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"isRecommend"
,
value
=
"0:未推荐,1:推荐"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"recommendDate"
,
value
=
"推荐时间,排序依据"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"recommendDate"
,
value
=
"推荐时间,排序依据"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"recommendOrder"
,
value
=
"推荐排序"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"recommendOrder"
,
value
=
"推荐排序"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"recommendCourse"
,
value
=
"推荐原因"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"recommendCourse"
,
value
=
"推荐原因(1-200)"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"remarks"
,
value
=
"备注"
,
required
=
false
,
dataType
=
"varchar"
)})
@ApiImplicitParam
(
name
=
"remarks"
,
value
=
"备注"
,
required
=
false
,
dataType
=
"varchar"
),
@PreAuthorize
(
"hasRole('ROLE_1001')"
)
@ApiImplicitParam
(
name
=
"name"
,
value
=
"姓名(1-15)"
,
required
=
false
,
dataType
=
"varchar"
)})
@PreAuthorize
(
"hasRole('ROLE_1001')"
)
@PostMapping
(
value
=
"/add"
)
@PostMapping
(
value
=
"/add"
)
public
Result
add
(
BStudent
bStudent
,
SysUser
user
)
throws
UnsupportedEncodingException
{
public
Result
add
(
BStudent
bStudent
,
SysUser
user
)
throws
UnsupportedEncodingException
{
if
(
bStudent
.
getCode
()!=
null
&&
bStudent
.
getCode
().
length
()>
if
(
bStudent
.
getCode
()!=
null
&&
bStudent
.
getCode
().
length
()>
...
...
src/main/java/org/rcisoft/business/bstudent/entity/BStudent.java
View file @
d3df9088
...
@@ -3,6 +3,8 @@ package org.rcisoft.business.bstudent.entity;
...
@@ -3,6 +3,8 @@ package org.rcisoft.business.bstudent.entity;
import
lombok.AllArgsConstructor
;
import
lombok.AllArgsConstructor
;
import
lombok.Data
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
import
lombok.NoArgsConstructor
;
import
org.hibernate.validator.constraints.Length
;
import
org.hibernate.validator.constraints.NotBlank
;
import
org.rcisoft.core.entity.IdEntity
;
import
org.rcisoft.core.entity.IdEntity
;
import
javax.persistence.Entity
;
import
javax.persistence.Entity
;
...
@@ -39,6 +41,8 @@ public class BStudent extends IdEntity<BStudent> {
...
@@ -39,6 +41,8 @@ public class BStudent extends IdEntity<BStudent> {
/*学号*/
/*学号*/
@Length
(
min
=
8
,
max
=
64
,
message
=
"长度最小为8,最大为50"
)
@NotBlank
private
String
code
;
private
String
code
;
/*0:未推荐,1:推荐*/
/*0:未推荐,1:推荐*/
private
String
isRecommend
;
private
String
isRecommend
;
...
@@ -47,8 +51,12 @@ public class BStudent extends IdEntity<BStudent> {
...
@@ -47,8 +51,12 @@ public class BStudent extends IdEntity<BStudent> {
/*推荐排序*/
/*推荐排序*/
private
Integer
recommendOrder
;
private
Integer
recommendOrder
;
/*推荐原因*/
/*推荐原因*/
@Length
(
min
=
1
,
max
=
256
,
message
=
"长度最小为1,最大为200"
)
@NotBlank
private
String
recommendCourse
;
private
String
recommendCourse
;
@Length
(
min
=
1
,
max
=
15
,
message
=
"长度最小为1,最大为15"
)
@NotBlank
@Transient
@Transient
private
String
name
;
private
String
name
;
...
@@ -56,6 +64,8 @@ public class BStudent extends IdEntity<BStudent> {
...
@@ -56,6 +64,8 @@ public class BStudent extends IdEntity<BStudent> {
private
String
sex
;
private
String
sex
;
@Transient
@Transient
@Length
(
min
=
1
,
max
=
20
,
message
=
"长度最小为1,最大为20"
)
@NotBlank
private
String
email
;
private
String
email
;
@Transient
@Transient
...
...
src/main/java/org/rcisoft/business/bteacher/controller/BTeacherController.java
View file @
d3df9088
...
@@ -39,11 +39,11 @@ public class BTeacherController extends PaginationController<BTeacher> {
...
@@ -39,11 +39,11 @@ public class BTeacherController extends PaginationController<BTeacher> {
@ApiOperation
(
value
=
"添加/编辑教师信息"
,
notes
=
"businessId为空时是添加方法,不为空时是修改方法"
)
@ApiOperation
(
value
=
"添加/编辑教师信息"
,
notes
=
"businessId为空时是添加方法,不为空时是修改方法"
)
@ApiImplicitParams
({
@ApiImplicitParam
(
name
=
"businessId"
,
value
=
"businessId"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParams
({
@ApiImplicitParam
(
name
=
"businessId"
,
value
=
"businessId"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"code"
,
value
=
"教师工号"
,
required
=
true
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"code"
,
value
=
"教师工号
(1-11)
"
,
required
=
true
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"isRecommend"
,
value
=
"0:未推荐,1:推荐"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"isRecommend"
,
value
=
"0:未推荐,1:推荐"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"recommendDate"
,
value
=
"推荐时间,排序依据"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"recommendDate"
,
value
=
"推荐时间,排序依据"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"recommendOrder"
,
value
=
"推荐排序"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"recommendOrder"
,
value
=
"推荐排序"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"recommendCourse"
,
value
=
"推荐原因"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"recommendCourse"
,
value
=
"推荐原因
(1-200)
"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"remarks"
,
value
=
"备注"
,
required
=
false
,
dataType
=
"varchar"
)})
@ApiImplicitParam
(
name
=
"remarks"
,
value
=
"备注"
,
required
=
false
,
dataType
=
"varchar"
)})
@PreAuthorize
(
"hasRole('ROLE_1001')"
)
@PreAuthorize
(
"hasRole('ROLE_1001')"
)
@PostMapping
(
value
=
"/add"
)
@PostMapping
(
value
=
"/add"
)
...
...
src/main/java/org/rcisoft/business/bteacher/entity/BTeacher.java
View file @
d3df9088
...
@@ -3,6 +3,8 @@ package org.rcisoft.business.bteacher.entity;
...
@@ -3,6 +3,8 @@ package org.rcisoft.business.bteacher.entity;
import
lombok.AllArgsConstructor
;
import
lombok.AllArgsConstructor
;
import
lombok.Data
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
import
lombok.NoArgsConstructor
;
import
org.hibernate.validator.constraints.Length
;
import
org.hibernate.validator.constraints.NotBlank
;
import
org.rcisoft.core.entity.IdEntity
;
import
org.rcisoft.core.entity.IdEntity
;
import
javax.persistence.Entity
;
import
javax.persistence.Entity
;
...
@@ -30,6 +32,7 @@ public class BTeacher extends IdEntity<BTeacher> {
...
@@ -30,6 +32,7 @@ public class BTeacher extends IdEntity<BTeacher> {
/*教师工号*/
/*教师工号*/
@Length
(
min
=
1
,
max
=
11
,
message
=
"长度最小为1,最大为11"
)
private
String
code
;
private
String
code
;
/*0:未推荐,1:推荐*/
/*0:未推荐,1:推荐*/
...
@@ -39,15 +42,19 @@ public class BTeacher extends IdEntity<BTeacher> {
...
@@ -39,15 +42,19 @@ public class BTeacher extends IdEntity<BTeacher> {
/*推荐排序*/
/*推荐排序*/
private
Integer
recommendOrder
;
private
Integer
recommendOrder
;
/*推荐原因*/
/*推荐原因*/
@Length
(
min
=
1
,
max
=
256
,
message
=
"长度最小为1,最大为200"
)
@NotBlank
private
String
recommendCourse
;
private
String
recommendCourse
;
@Transient
@Transient
@Length
(
min
=
1
,
max
=
15
,
message
=
"长度最小为1,最大为15"
)
private
String
name
;
private
String
name
;
@Transient
@Transient
private
String
sex
;
private
String
sex
;
@Transient
@Transient
@Length
(
min
=
1
,
max
=
20
,
message
=
"长度最小为1,最大为20"
)
private
String
email
;
private
String
email
;
@Transient
@Transient
...
...
src/main/java/org/rcisoft/business/bterm/controller/BTermController.java
View file @
d3df9088
...
@@ -44,15 +44,15 @@ public class BTermController extends PaginationController<BTerm> {
...
@@ -44,15 +44,15 @@ public class BTermController extends PaginationController<BTerm> {
@ApiImplicitParam
(
name
=
"startDate"
,
value
=
"学期开始时间"
,
required
=
true
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"startDate"
,
value
=
"学期开始时间"
,
required
=
true
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"endDate"
,
value
=
"学期结束时间"
,
required
=
true
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"endDate"
,
value
=
"学期结束时间"
,
required
=
true
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"isStart"
,
value
=
"是否启动(0:未启动,1:启动)"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"isStart"
,
value
=
"是否启动(0:未启动,1:启动)"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"code"
,
value
=
"学期编号"
,
required
=
true
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"code"
,
value
=
"学期编号
(1-15)
"
,
required
=
true
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"name"
,
value
=
"学期名称"
,
required
=
true
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"name"
,
value
=
"学期名称
(1-50)
"
,
required
=
true
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"remarks"
,
value
=
"备注"
,
required
=
false
,
dataType
=
"varchar"
)})
@ApiImplicitParam
(
name
=
"remarks"
,
value
=
"备注"
,
required
=
false
,
dataType
=
"varchar"
)})
@PreAuthorize
(
"hasRole('ROLE_1001')"
)
@PreAuthorize
(
"hasRole('ROLE_1001')"
)
@PostMapping
(
value
=
"/add"
)
@PostMapping
(
value
=
"/add"
)
public
Result
add
(
@Valid
BTermDTO
bTermDTO
,
BindingResult
bindingResult
)
{
public
Result
add
(
@Valid
BTermDTO
bTermDTO
,
BindingResult
bindingResult
)
{
if
(
bTermDTO
.
getCode
().
length
()
>
/*
if(bTermDTO.getCode().length() >
Integer.parseInt(global.getMAX_CODE_LENGTH()))
Integer.parseInt(global.getMAX_CODE_LENGTH()))
throw
new
ServiceException
(
ResultServiceEnums
.
PARAMETER_ERROR
);
throw new ServiceException(ResultServiceEnums.PARAMETER_ERROR);
*/
BTerm
bTerm
=
BTermDTO2BTermConverter
.
convert
(
bTermDTO
);
BTerm
bTerm
=
BTermDTO2BTermConverter
.
convert
(
bTermDTO
);
PersistModel
data
=
bTermService
.
persist
(
bTerm
,
getToken
());
PersistModel
data
=
bTermService
.
persist
(
bTerm
,
getToken
());
return
Result
.
builder
(
data
,
return
Result
.
builder
(
data
,
...
...
src/main/java/org/rcisoft/business/bterm/dto/BTermDTO.java
View file @
d3df9088
package
org
.
rcisoft
.
business
.
bterm
.
dto
;
package
org
.
rcisoft
.
business
.
bterm
.
dto
;
import
lombok.Data
;
import
lombok.Data
;
import
org.hibernate.validator.constraints.Length
;
import
org.hibernate.validator.constraints.NotBlank
;
import
javax.validation.constraints.NotNull
;
import
java.util.Date
;
import
java.util.Date
;
/**
/**
...
@@ -9,10 +12,23 @@ import java.util.Date;
...
@@ -9,10 +12,23 @@ import java.util.Date;
*/
*/
@Data
@Data
public
class
BTermDTO
{
public
class
BTermDTO
{
@NotNull
@NotBlank
private
String
startDate
;
private
String
startDate
;
@NotNull
@NotBlank
private
String
endDate
;
private
String
endDate
;
private
String
isStart
;
private
String
isStart
;
@NotBlank
@Length
(
min
=
1
,
max
=
15
,
message
=
"长度最小为1,最大为15"
)
private
String
code
;
private
String
code
;
@NotBlank
@Length
(
min
=
1
,
max
=
50
,
message
=
"长度最小为1,最大为50"
)
private
String
name
;
private
String
name
;
private
String
businessId
;
private
String
businessId
;
}
}
src/main/java/org/rcisoft/business/bterm/entity/BTerm.java
View file @
d3df9088
...
@@ -4,10 +4,12 @@ import lombok.AllArgsConstructor;
...
@@ -4,10 +4,12 @@ import lombok.AllArgsConstructor;
import
lombok.Data
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
import
lombok.NoArgsConstructor
;
import
org.hibernate.validator.constraints.Length
;
import
org.hibernate.validator.constraints.Length
;
import
org.hibernate.validator.constraints.NotBlank
;
import
org.rcisoft.core.entity.IdEntity
;
import
org.rcisoft.core.entity.IdEntity
;
import
javax.persistence.Entity
;
import
javax.persistence.Entity
;
import
javax.persistence.Table
;
import
javax.persistence.Table
;
import
javax.validation.constraints.NotNull
;
import
java.util.Date
;
import
java.util.Date
;
/**
/**
...
@@ -28,14 +30,21 @@ public class BTerm extends IdEntity<BTerm> {
...
@@ -28,14 +30,21 @@ public class BTerm extends IdEntity<BTerm> {
/*学期开始时间*/
/*学期开始时间*/
@NotBlank
@NotNull
private
Date
startDate
;
private
Date
startDate
;
/*学期结束时间*/
/*学期结束时间*/
@NotBlank
@NotNull
private
Date
endDate
;
private
Date
endDate
;
/*是否启动(0:未启动,1:启动)*/
/*是否启动(0:未启动,1:启动)*/
private
String
isStart
;
private
String
isStart
;
/*学期编号*/
/*学期编号*/
@NotBlank
@Length
(
min
=
1
,
max
=
15
,
message
=
"长度最小为1,最大为15"
)
private
String
code
;
private
String
code
;
/*学期名称*/
/*学期名称*/
@NotBlank
@Length
(
min
=
1
,
max
=
50
,
message
=
"长度最小为1,最大为50"
)
@Length
(
min
=
1
,
max
=
50
,
message
=
"长度最小为1,最大为50"
)
private
String
name
;
private
String
name
;
...
...
src/main/java/org/rcisoft/business/texaminfo/controller/TExamInfoController.java
View file @
d3df9088
...
@@ -44,7 +44,8 @@ public class TExamInfoController extends PaginationController<TExamInfo> {
...
@@ -44,7 +44,8 @@ public class TExamInfoController extends PaginationController<TExamInfo> {
@ApiOperation
(
value
=
"添加"
,
notes
=
"添加"
)
@ApiOperation
(
value
=
"添加"
,
notes
=
"添加"
)
@ApiImplicitParams
({
@ApiImplicitParam
(
name
=
"chapterId"
,
value
=
"chapterId"
,
required
=
true
,
dataType
=
"varchar"
)})
@ApiImplicitParams
({
@ApiImplicitParam
(
name
=
"chapterId"
,
value
=
"chapterId"
,
required
=
true
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"ip"
,
value
=
"ip(1-30)"
,
required
=
false
,
dataType
=
"varchar"
)})
@PostMapping
(
"/add"
)
@PostMapping
(
"/add"
)
public
Result
add
(
String
chapterId
,
HttpServletRequest
request
)
{
public
Result
add
(
String
chapterId
,
HttpServletRequest
request
)
{
String
userId
=
UserUtil
.
getUserInfoProp
(
getToken
(),
UserUtil
.
USER_ID
);
String
userId
=
UserUtil
.
getUserInfoProp
(
getToken
(),
UserUtil
.
USER_ID
);
...
...
src/main/java/org/rcisoft/business/texaminfo/entity/TExamDetail.java
View file @
d3df9088
...
@@ -2,6 +2,8 @@ package org.rcisoft.business.texaminfo.entity;
...
@@ -2,6 +2,8 @@ package org.rcisoft.business.texaminfo.entity;
import
lombok.*
;
import
lombok.*
;
import
org.hibernate.validator.constraints.Length
;
import
org.hibernate.validator.constraints.NotBlank
;
import
org.rcisoft.core.entity.IdEntity
;
import
org.rcisoft.core.entity.IdEntity
;
import
javax.persistence.*
;
import
javax.persistence.*
;
import
java.math.BigDecimal
;
import
java.math.BigDecimal
;
...
@@ -22,14 +24,20 @@ public class TExamDetail extends IdEntity<TExamDetail> {
...
@@ -22,14 +24,20 @@ public class TExamDetail extends IdEntity<TExamDetail> {
private
static
final
long
serialVersionUID
=
-
3767007435655705399L
;
private
static
final
long
serialVersionUID
=
-
3767007435655705399L
;
@Length
(
min
=
1
,
max
=
64
,
message
=
"长度最小为1,最大为50"
)
@NotBlank
private
String
pId
;
private
String
pId
;
@Length
(
min
=
1
,
max
=
64
,
message
=
"长度最小为1,最大为50"
)
@NotBlank
private
String
eId
;
private
String
eId
;
@Length
(
min
=
1
,
max
=
64
,
message
=
"长度最小为1,最大为50"
)
@NotBlank
private
String
qId
;
private
String
qId
;
@Length
(
min
=
1
,
max
=
64
,
message
=
"长度最小为1,最大为50"
)
@NotBlank
private
String
uId
;
private
String
uId
;
@Length
(
min
=
1
,
max
=
500
,
message
=
"长度最小为1,最大为450"
)
@NotBlank
private
String
uAnswer
;
private
String
uAnswer
;
private
String
qtype
;
private
String
qtype
;
...
...
src/main/java/org/rcisoft/business/texaminfo/entity/TExamInfo.java
View file @
d3df9088
...
@@ -2,6 +2,8 @@ package org.rcisoft.business.texaminfo.entity;
...
@@ -2,6 +2,8 @@ package org.rcisoft.business.texaminfo.entity;
import
lombok.*
;
import
lombok.*
;
import
org.hibernate.validator.constraints.Length
;
import
org.hibernate.validator.constraints.NotBlank
;
import
org.rcisoft.core.entity.IdEntity
;
import
org.rcisoft.core.entity.IdEntity
;
import
javax.persistence.*
;
import
javax.persistence.*
;
import
java.math.BigDecimal
;
import
java.math.BigDecimal
;
...
@@ -21,9 +23,11 @@ import java.util.List;
...
@@ -21,9 +23,11 @@ import java.util.List;
public
class
TExamInfo
extends
IdEntity
<
TExamInfo
>
{
public
class
TExamInfo
extends
IdEntity
<
TExamInfo
>
{
@Length
(
min
=
1
,
max
=
64
,
message
=
"长度最小为1,最大为50"
)
@NotBlank
private
String
pId
;
private
String
pId
;
@Length
(
min
=
1
,
max
=
64
,
message
=
"长度最小为1,最大为50"
)
@NotBlank
private
String
uId
;
private
String
uId
;
private
String
status
;
private
String
status
;
...
@@ -31,7 +35,8 @@ public class TExamInfo extends IdEntity<TExamInfo> {
...
@@ -31,7 +35,8 @@ public class TExamInfo extends IdEntity<TExamInfo> {
private
Float
pScore
;
private
Float
pScore
;
private
Integer
sorder
;
private
Integer
sorder
;
@Length
(
min
=
1
,
max
=
30
,
message
=
"长度最小为1,最大为25"
)
@NotBlank
private
String
ip
;
private
String
ip
;
public
TExamInfo
(
String
pId
)
{
public
TExamInfo
(
String
pId
)
{
...
...
src/main/java/org/rcisoft/business/tpaper/entity/TPaper.java
View file @
d3df9088
...
@@ -2,6 +2,8 @@ package org.rcisoft.business.tpaper.entity;
...
@@ -2,6 +2,8 @@ package org.rcisoft.business.tpaper.entity;
import
lombok.*
;
import
lombok.*
;
import
org.hibernate.validator.constraints.Length
;
import
org.hibernate.validator.constraints.NotBlank
;
import
org.rcisoft.core.entity.AutoIncrementEntity
;
import
org.rcisoft.core.entity.AutoIncrementEntity
;
import
org.rcisoft.core.entity.IdEntity
;
import
org.rcisoft.core.entity.IdEntity
;
import
javax.persistence.*
;
import
javax.persistence.*
;
...
@@ -23,9 +25,11 @@ public class TPaper extends AutoIncrementEntity<TPaper> {
...
@@ -23,9 +25,11 @@ public class TPaper extends AutoIncrementEntity<TPaper> {
private
static
final
long
serialVersionUID
=
8239396163023570214L
;
private
static
final
long
serialVersionUID
=
8239396163023570214L
;
@Length
(
min
=
1
,
max
=
64
,
message
=
"长度最小为1,最大为50"
)
@NotBlank
private
String
pcId
;
private
String
pcId
;
@Length
(
min
=
1
,
max
=
64
,
message
=
"长度最小为1,最大为50"
)
@NotBlank
private
String
chapId
;
private
String
chapId
;
private
Float
pScore
;
private
Float
pScore
;
...
...
src/main/java/org/rcisoft/business/tpaper/entity/TPaperDetail.java
View file @
d3df9088
...
@@ -2,6 +2,8 @@ package org.rcisoft.business.tpaper.entity;
...
@@ -2,6 +2,8 @@ package org.rcisoft.business.tpaper.entity;
import
lombok.*
;
import
lombok.*
;
import
org.hibernate.validator.constraints.Length
;
import
org.hibernate.validator.constraints.NotBlank
;
import
org.rcisoft.core.entity.AutoIncrementEntity
;
import
org.rcisoft.core.entity.AutoIncrementEntity
;
import
org.rcisoft.core.entity.IdEntity
;
import
org.rcisoft.core.entity.IdEntity
;
import
javax.persistence.*
;
import
javax.persistence.*
;
...
@@ -23,11 +25,14 @@ public class TPaperDetail extends AutoIncrementEntity<TPaperDetail> {
...
@@ -23,11 +25,14 @@ public class TPaperDetail extends AutoIncrementEntity<TPaperDetail> {
private
static
final
long
serialVersionUID
=
-
7387975301231354793L
;
private
static
final
long
serialVersionUID
=
-
7387975301231354793L
;
@Length
(
min
=
1
,
max
=
64
,
message
=
"长度最小为1,最大为50"
)
@NotBlank
private
String
pId
;
private
String
pId
;
@Length
(
min
=
1
,
max
=
64
,
message
=
"长度最小为1,最大为50"
)
@NotBlank
private
String
psId
;
private
String
psId
;
@Length
(
min
=
1
,
max
=
64
,
message
=
"长度最小为1,最大为50"
)
@NotBlank
private
String
qId
;
private
String
qId
;
private
Float
pScore
;
private
Float
pScore
;
...
...
src/main/java/org/rcisoft/business/tpaper/entity/TPaperSection.java
View file @
d3df9088
...
@@ -2,6 +2,8 @@ package org.rcisoft.business.tpaper.entity;
...
@@ -2,6 +2,8 @@ package org.rcisoft.business.tpaper.entity;
import
lombok.*
;
import
lombok.*
;
import
org.hibernate.validator.constraints.Length
;
import
org.hibernate.validator.constraints.NotBlank
;
import
org.rcisoft.core.entity.AutoIncrementEntity
;
import
org.rcisoft.core.entity.AutoIncrementEntity
;
import
org.rcisoft.core.entity.IdEntity
;
import
org.rcisoft.core.entity.IdEntity
;
import
javax.persistence.*
;
import
javax.persistence.*
;
...
@@ -23,9 +25,11 @@ public class TPaperSection extends AutoIncrementEntity<TPaperSection> {
...
@@ -23,9 +25,11 @@ public class TPaperSection extends AutoIncrementEntity<TPaperSection> {
private
static
final
long
serialVersionUID
=
-
2596263315203973219L
;
private
static
final
long
serialVersionUID
=
-
2596263315203973219L
;
@Length
(
min
=
1
,
max
=
64
,
message
=
"长度最小为1,最大为50"
)
@NotBlank
private
String
pId
;
private
String
pId
;
@Length
(
min
=
1
,
max
=
200
,
message
=
"长度最小为1,最大为150"
)
@NotBlank
private
String
sdesc
;
private
String
sdesc
;
private
Integer
sorder
;
private
Integer
sorder
;
...
...
src/main/java/org/rcisoft/business/tpaperchapter/controller/TPaperChapterController.java
View file @
d3df9088
...
@@ -38,11 +38,11 @@ public class TPaperChapterController extends PaginationController<TPaperChapter>
...
@@ -38,11 +38,11 @@ public class TPaperChapterController extends PaginationController<TPaperChapter>
@ApiOperation
(
value
=
"添加练习"
,
notes
=
"添加练习"
)
@ApiOperation
(
value
=
"添加练习"
,
notes
=
"添加练习"
)
@ApiImplicitParams
({
@ApiImplicitParam
(
name
=
"pdesc"
,
value
=
"说明"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParams
({
@ApiImplicitParam
(
name
=
"pdesc"
,
value
=
"说明"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"slId"
,
value
=
"开课ID"
,
required
=
true
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"slId"
,
value
=
"开课ID
(1-50)
"
,
required
=
true
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"chapId"
,
value
=
"章节id"
,
required
=
true
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"chapId"
,
value
=
"章节id
(1-50)
"
,
required
=
true
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"poption"
,
value
=
"1 随机 2 自主"
,
required
=
true
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"poption"
,
value
=
"1 随机 2 自主"
,
required
=
true
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"pscope"
,
value
=
"1 全部 2 本节"
,
required
=
true
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"pscope"
,
value
=
"1 全部 2 本节"
,
required
=
true
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"pcompose"
,
value
=
"{'1':3,'2':0} 3道选择,2道判断"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"pcompose"
,
value
=
"{'1':3,'2':0} 3道选择,2道判断
(1-30)
"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"choiceIds"
,
value
=
"选择题ID"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"choiceIds"
,
value
=
"选择题ID"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"judgmentIds"
,
value
=
"判断题ID"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"judgmentIds"
,
value
=
"判断题ID"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"multiSelectIds"
,
value
=
"多选题ID"
,
required
=
false
,
dataType
=
"varchar"
)})
@ApiImplicitParam
(
name
=
"multiSelectIds"
,
value
=
"多选题ID"
,
required
=
false
,
dataType
=
"varchar"
)})
...
...
src/main/java/org/rcisoft/business/tpaperchapter/entity/TPaperChapter.java
View file @
d3df9088
...
@@ -2,6 +2,8 @@ package org.rcisoft.business.tpaperchapter.entity;
...
@@ -2,6 +2,8 @@ package org.rcisoft.business.tpaperchapter.entity;
import
lombok.*
;
import
lombok.*
;
import
org.hibernate.validator.constraints.Length
;
import
org.hibernate.validator.constraints.NotBlank
;
import
org.rcisoft.business.tquestion.entity.QuestionNumDto
;
import
org.rcisoft.business.tquestion.entity.QuestionNumDto
;
import
org.rcisoft.core.entity.IdEntity
;
import
org.rcisoft.core.entity.IdEntity
;
import
javax.persistence.*
;
import
javax.persistence.*
;
...
@@ -24,13 +26,16 @@ public class TPaperChapter extends IdEntity<TPaperChapter> {
...
@@ -24,13 +26,16 @@ public class TPaperChapter extends IdEntity<TPaperChapter> {
private
static
final
long
serialVersionUID
=
5201491638420229438L
;
private
static
final
long
serialVersionUID
=
5201491638420229438L
;
private
String
pdesc
;
private
String
pdesc
;
@Length
(
min
=
1
,
max
=
64
,
message
=
"长度最小为1,最大为50"
)
@NotBlank
private
String
slId
;
private
String
slId
;
@Length
(
min
=
1
,
max
=
64
,
message
=
"长度最小为1,最大为50"
)
@NotBlank
private
String
chapId
;
private
String
chapId
;
private
Float
pScore
;
private
Float
pScore
;
@Length
(
min
=
1
,
max
=
1
,
message
=
"长度最小为1,最大为1"
)
@NotBlank
private
String
poption
;
private
String
poption
;
private
String
pscope
;
private
String
pscope
;
...
...
src/main/java/org/rcisoft/business/tquestion/controller/TQuestionController.java
View file @
d3df9088
...
@@ -38,10 +38,11 @@ public class TQuestionController extends PaginationController<TQuestion> {
...
@@ -38,10 +38,11 @@ public class TQuestionController extends PaginationController<TQuestion> {
@ApiImplicitParams
({
@ApiImplicitParam
(
name
=
"slId"
,
value
=
"课程ID"
,
required
=
true
,
dataType
=
"varchar"
),
@ApiImplicitParams
({
@ApiImplicitParam
(
name
=
"slId"
,
value
=
"课程ID"
,
required
=
true
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"chapId"
,
value
=
"章ID"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"chapId"
,
value
=
"章ID"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"qtype"
,
value
=
"1 选择题 2 多选题 3 判断题"
,
required
=
true
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"qtype"
,
value
=
"1 选择题 2 多选题 3 判断题"
,
required
=
true
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"qtitle"
,
value
=
"题干"
,
required
=
true
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"qtitle"
,
value
=
"题干(1-180)"
,
required
=
true
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"qdesc"
,
value
=
"解析"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"qdesc"
,
value
=
"解析(1-250)"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"qanswer"
,
value
=
"单选从0开始;判断:0错误 1正确;多选 0,1,2"
,
required
=
true
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"qanswer"
,
value
=
"单选从0开始;判断:0错误 1正确;多选 0,1,2(1-15)"
,
required
=
true
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"questionOptions"
,
value
=
"选项"
,
required
=
true
,
dataType
=
"varchar"
)})
@ApiImplicitParam
(
name
=
"questionOptions"
,
value
=
"选项"
,
required
=
true
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"represent"
,
value
=
"列描述(1-40)"
,
required
=
true
,
dataType
=
"varchar"
)})
@PostMapping
(
"/add"
)
@PostMapping
(
"/add"
)
@PreAuthorize
(
"hasRole('ROLE_1002')"
)
@PreAuthorize
(
"hasRole('ROLE_1002')"
)
public
Result
add
(
TQuestion
tQuestion
)
{
public
Result
add
(
TQuestion
tQuestion
)
{
...
...
src/main/java/org/rcisoft/business/tquestion/entity/TQuestion.java
View file @
d3df9088
...
@@ -2,6 +2,8 @@ package org.rcisoft.business.tquestion.entity;
...
@@ -2,6 +2,8 @@ package org.rcisoft.business.tquestion.entity;
import
lombok.*
;
import
lombok.*
;
import
org.hibernate.validator.constraints.Length
;
import
org.hibernate.validator.constraints.NotBlank
;
import
org.rcisoft.core.entity.IdEntity
;
import
org.rcisoft.core.entity.IdEntity
;
import
javax.persistence.*
;
import
javax.persistence.*
;
import
java.math.BigDecimal
;
import
java.math.BigDecimal
;
...
@@ -23,17 +25,22 @@ public class TQuestion extends IdEntity<TQuestion> {
...
@@ -23,17 +25,22 @@ public class TQuestion extends IdEntity<TQuestion> {
private
static
final
long
serialVersionUID
=
4926963786636914161L
;
private
static
final
long
serialVersionUID
=
4926963786636914161L
;
@Length
(
min
=
1
,
max
=
64
,
message
=
"长度最小为1,最大为50"
)
@NotBlank
private
String
slId
;
private
String
slId
;
@Length
(
min
=
1
,
max
=
64
,
message
=
"长度最小为1,最大为50"
)
@NotBlank
private
String
chapId
;
private
String
chapId
;
private
String
qtype
;
private
String
qtype
;
@Length
(
min
=
1
,
max
=
200
,
message
=
"长度最小为1,最大为180"
)
@NotBlank
private
String
qtitle
;
private
String
qtitle
;
@Length
(
min
=
1
,
max
=
300
,
message
=
"长度最小为1,最大为180"
)
@NotBlank
private
String
qdesc
;
private
String
qdesc
;
@Length
(
min
=
1
,
max
=
20
,
message
=
"长度最小为1,最大为15"
)
@NotBlank
private
String
qanswer
;
private
String
qanswer
;
/*private String qid;
/*private String qid;
...
...
src/main/java/org/rcisoft/business/tquestion/entity/TQuestionOptions.java
View file @
d3df9088
...
@@ -2,6 +2,8 @@ package org.rcisoft.business.tquestion.entity;
...
@@ -2,6 +2,8 @@ package org.rcisoft.business.tquestion.entity;
import
lombok.*
;
import
lombok.*
;
import
org.hibernate.validator.constraints.Length
;
import
org.hibernate.validator.constraints.NotBlank
;
import
org.rcisoft.core.entity.IdEntity
;
import
org.rcisoft.core.entity.IdEntity
;
import
javax.persistence.*
;
import
javax.persistence.*
;
import
java.math.BigDecimal
;
import
java.math.BigDecimal
;
...
@@ -23,9 +25,11 @@ public class TQuestionOptions extends IdEntity<TQuestionOptions> {
...
@@ -23,9 +25,11 @@ public class TQuestionOptions extends IdEntity<TQuestionOptions> {
private
static
final
long
serialVersionUID
=
375966816294919634L
;
private
static
final
long
serialVersionUID
=
375966816294919634L
;
private
String
qid
;
private
String
qid
;
@Length
(
min
=
1
,
max
=
2
,
message
=
"长度最小为1,最大为2"
)
@NotBlank
private
String
alias
;
private
String
alias
;
@Length
(
min
=
1
,
max
=
50
,
message
=
"长度最小为1,最大为40"
)
@NotBlank
private
String
represent
;
private
String
represent
;
...
...
src/main/java/org/rcisoft/sys/role/controller/SysRoleController.java
View file @
d3df9088
...
@@ -30,8 +30,8 @@ public class SysRoleController extends PaginationController<SysRole> {
...
@@ -30,8 +30,8 @@ public class SysRoleController extends PaginationController<SysRole> {
@ApiOperation
(
value
=
"查询角色名是否合法"
,
notes
=
"查询角色名是否合法(true 合法 false 不合法 不能有其它的输出)"
)
@ApiOperation
(
value
=
"查询角色名是否合法"
,
notes
=
"查询角色名是否合法(true 合法 false 不合法 不能有其它的输出)"
)
@ApiImplicitParams
({
@ApiImplicitParam
(
name
=
"businessId"
,
value
=
"businessId"
,
required
=
true
,
dataType
=
"varchar"
),
@ApiImplicitParams
({
@ApiImplicitParam
(
name
=
"businessId"
,
value
=
"businessId"
,
required
=
true
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"name"
,
value
=
"角色名称"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"name"
,
value
=
"角色名称
(1-50)
"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"code"
,
value
=
"权限code"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"code"
,
value
=
"权限code
(1-50)
"
,
required
=
false
,
dataType
=
"varchar"
),
@ApiImplicitParam
(
name
=
"remarks"
,
value
=
"备注"
,
required
=
false
,
dataType
=
"varchar"
)})
@ApiImplicitParam
(
name
=
"remarks"
,
value
=
"备注"
,
required
=
false
,
dataType
=
"varchar"
)})
@GetMapping
(
value
=
"queryRoleValidate"
)
@GetMapping
(
value
=
"queryRoleValidate"
)
public
String
queryRoleValidate
(
SysRole
sysRole
){
public
String
queryRoleValidate
(
SysRole
sysRole
){
...
...
src/main/java/org/rcisoft/sys/role/entity/SysRole.java
View file @
d3df9088
package
org
.
rcisoft
.
sys
.
role
.
entity
;
package
org
.
rcisoft
.
sys
.
role
.
entity
;
import
lombok.Data
;
import
lombok.Data
;
import
org.hibernate.validator.constraints.Length
;
import
org.hibernate.validator.constraints.NotBlank
;
import
org.rcisoft.core.entity.IdEntity
;
import
org.rcisoft.core.entity.IdEntity
;
/**
/**
...
@@ -9,6 +11,10 @@ import org.rcisoft.core.entity.IdEntity;
...
@@ -9,6 +11,10 @@ import org.rcisoft.core.entity.IdEntity;
@Data
@Data
public
class
SysRole
extends
IdEntity
<
SysRole
>
{
public
class
SysRole
extends
IdEntity
<
SysRole
>
{
private
static
final
long
serialVersionUID
=
3877407102289435226L
;
private
static
final
long
serialVersionUID
=
3877407102289435226L
;
@Length
(
min
=
1
,
max
=
64
,
message
=
"长度最小为1,最大为50"
)
@NotBlank
private
String
roleName
;
private
String
roleName
;
@Length
(
min
=
1
,
max
=
64
,
message
=
"长度最小为1,最大为50"
)
@NotBlank
private
String
code
;
private
String
code
;
}
}
src/main/java/org/rcisoft/sys/user/entity/SysUser.java
View file @
d3df9088
...
@@ -5,6 +5,8 @@ import com.google.common.collect.Lists;
...
@@ -5,6 +5,8 @@ import com.google.common.collect.Lists;
import
lombok.AllArgsConstructor
;
import
lombok.AllArgsConstructor
;
import
lombok.Data
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
import
lombok.NoArgsConstructor
;
import
org.hibernate.validator.constraints.Length
;
import
org.hibernate.validator.constraints.NotBlank
;
import
org.rcisoft.core.entity.IdEntity
;
import
org.rcisoft.core.entity.IdEntity
;
import
org.rcisoft.sys.role.entity.SysRole
;
import
org.rcisoft.sys.role.entity.SysRole
;
import
org.springframework.security.core.authority.SimpleGrantedAuthority
;
import
org.springframework.security.core.authority.SimpleGrantedAuthority
;
...
@@ -31,19 +33,35 @@ public class SysUser extends IdEntity<SysUser> {
...
@@ -31,19 +33,35 @@ public class SysUser extends IdEntity<SysUser> {
/** 密码 */
/** 密码 */
@Length
(
min
=
1
,
max
=
100
,
message
=
"长度最小为1,最大为80"
)
@NotBlank
private
String
password
;
private
String
password
;
/** 用户名 */
/** 用户名 */
@Length
(
min
=
1
,
max
=
64
,
message
=
"长度最小为1,最大为50"
)
@NotBlank
private
String
loginName
;
private
String
loginName
;
/** 用户名 */
/** 用户名 */
@Length
(
min
=
1
,
max
=
15
,
message
=
"长度最小为1,最大为10"
)
@NotBlank
private
String
name
;
private
String
name
;
@Length
(
min
=
1
,
max
=
20
,
message
=
"长度最小为1,最大为15"
)
@NotBlank
private
String
email
;
// 邮箱
private
String
email
;
// 邮箱
@Length
(
min
=
1
,
max
=
11
,
message
=
"长度最小为1,最大为11"
)
@NotBlank
private
String
phone
;
// 电话
private
String
phone
;
// 电话
private
String
sex
;
private
String
sex
;
@Length
(
min
=
1
,
max
=
256
,
message
=
"长度最小为1,最大为200"
)
@NotBlank
private
String
headPic
;
//头像
private
String
headPic
;
//头像
@Length
(
min
=
1
,
max
=
32
,
message
=
"长度最小为1,最大为30"
)
@NotBlank
private
String
gitLabId
;
//gitLab账号id
private
String
gitLabId
;
//gitLab账号id
@Length
(
min
=
1
,
max
=
32
,
message
=
"长度最小为1,最大为30"
)
@NotBlank
private
String
gitLabUsername
;
//gitLab账号
private
String
gitLabUsername
;
//gitLab账号
@Length
(
min
=
1
,
max
=
32
,
message
=
"长度最小为1,最大为30"
)
@NotBlank
private
String
gitLabImpressionToken
;
//gitLab账号模拟令牌
private
String
gitLabImpressionToken
;
//gitLab账号模拟令牌
...
...
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