wsr/orange-admin
1
0
Fork 0
mirror of https://gitee.com/orangeform/orange-admin.git synced 2026-01-18 02:56:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

commit：同步1.3版本

Browse Source
This commit is contained in:
Jerry
2021-01-03 22:29:02 +08:00
parent ef316438da
commit 25023e29b5
706 changed files with 23404 additions and 14179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
orange-demo-multi-service/application/course-class/course-class-interface/course-class-interface.iml
View File

@@ -85,12 +85,12 @@
<orderEntry type="library" name="Maven: tk.mybatis:mapper-spring:1.1.5" level="project" />
<orderEntry type="library" name="Maven: tk.mybatis:mapper-extra:1.1.5" level="project" />
<orderEntry type="library" name="Maven: tk.mybatis:mapper-spring-boot-autoconfigure:2.1.5" level="project" />
<orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.2.13" level="project" />
<orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.1.1" level="project" />
<orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.1.1" level="project" />
<orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.2.13" level="project" />
<orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.1.11" level="project" />
<orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:2.0" level="project" />
<orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.3.0" level="project" />
<orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.1.3" level="project" />
<orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.1.3" level="project" />
<orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.3.0" level="project" />
<orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.2.0" level="project" />
<orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:3.2" level="project" />
<orderEntry type="module" module-name="common-swagger" />
<orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-micro-spring-boot-starter:2.0.5" level="project" />
<orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring-boot-autoconfigure:2.0.5" level="project" />

6
orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/dto/ClassCourseDto.java
View File

@@ -2,6 +2,8 @@ package com.orange.demo.courseclassinterface.dto;
import com.orange.demo.common.core.validator.UpdateGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.*;
@@ -12,24 +14,28 @@ import javax.validation.constraints.*;
* @author Jerry
* @date 2020-08-08
*/
@ApiModel("ClassCourseDto对象")
@Data
public class ClassCourseDto {
/**
* 班级Id。
*/
@ApiModelProperty(value = "班级Id", required = true)
@NotNull(message = "数据验证失败，班级Id不能为空！", groups = {UpdateGroup.class})
private Long classId;
/**
* 课程Id。
*/
@ApiModelProperty(value = "课程Id", required = true)
@NotNull(message = "数据验证失败，课程Id不能为空！", groups = {UpdateGroup.class})
private Long courseId;
/**
* 课程顺序(数值越小越靠前)。
*/
@ApiModelProperty(value = "课程顺序(数值越小越靠前)", required = true)
@NotNull(message = "数据验证失败，课程顺序(数值越小越靠前)不能为空！", groups = {UpdateGroup.class})
private Integer courseOrder;
}

5
orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/dto/ClassStudentDto.java
View File

@@ -2,6 +2,8 @@ package com.orange.demo.courseclassinterface.dto;
import com.orange.demo.common.core.validator.UpdateGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.*;
@@ -12,18 +14,21 @@ import javax.validation.constraints.*;
* @author Jerry
* @date 2020-08-08
*/
@ApiModel("ClassStudentDto对象")
@Data
public class ClassStudentDto {
/**
* 班级Id。
*/
@ApiModelProperty(value = "班级Id", required = true)
@NotNull(message = "数据验证失败，班级Id不能为空！", groups = {UpdateGroup.class})
private Long classId;
/**
* 学生Id。
*/
@ApiModelProperty(value = "学生Id", required = true)
@NotNull(message = "数据验证失败，学生Id不能为空！", groups = {UpdateGroup.class})
private Long studentId;
}

21
orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/dto/CourseDto.java
View File

@@ -12,7 +12,6 @@ import lombok.Data;
import javax.validation.constraints.*;
import java.math.BigDecimal;
import java.util.Date;
/**
* CourseDto对象。
@@ -20,7 +19,7 @@ import java.util.Date;
* @author Jerry
* @date 2020-08-08
*/
@ApiModel("CourseDto实体对象")
@ApiModel("CourseDto对象")
@Data
public class CourseDto {
@@ -88,24 +87,6 @@ public class CourseDto {
@NotBlank(message = "数据验证失败，课程图片不能为空！")
private String pictureUrl;
/**
* 创建用户Id。
*/
@ApiModelProperty(value = "创建用户Id")
private Long createUserId;
/**
* 创建时间。
*/
@ApiModelProperty(value = "创建时间")
private Date createTime;
/**
* 最后修改时间。
*/
@ApiModelProperty(value = "最后修改时间")
private Date updateTime;
/**
* price 范围过滤起始值(>=)。
*/

2
orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/dto/GradeDto.java
View File

@@ -14,7 +14,7 @@ import javax.validation.constraints.*;
* @author Jerry
* @date 2020-08-08
*/
@ApiModel("GradeDto实体对象")
@ApiModel("GradeDto对象")
@Data
public class GradeDto {

3
orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/dto/SchoolInfoDto.java
View File

@@ -8,14 +8,13 @@ import lombok.Data;
import javax.validation.constraints.*;
/**
* SchoolInfoDto对象。
*
* @author Jerry
* @date 2020-08-08
*/
@ApiModel("SchoolInfoDto实体对象")
@ApiModel("SchoolInfoDto对象")
@Data
public class SchoolInfoDto {

16
orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/dto/StudentClassDto.java
View File

@@ -10,15 +10,13 @@ import lombok.Data;
import javax.validation.constraints.*;
import java.util.Date;
/**
* StudentClassDto对象。
*
* @author Jerry
* @date 2020-08-08
*/
@ApiModel("StudentClassDto实体对象")
@ApiModel("StudentClassDto对象")
@Data
public class StudentClassDto {
@@ -64,16 +62,4 @@ public class StudentClassDto {
@NotNull(message = "数据验证失败，班级级别不能为空！")
@ConstDictRef(constDictClass = ClassLevel.class, message = "数据验证失败，班级级别为无效值！")
private Integer classLevel;
/**
* 创建用户。
*/
@ApiModelProperty(value = "创建用户")
private Long createUserId;
/**
* 班级创建时间。
*/
@ApiModelProperty(value = "班级创建时间")
private Date createTime;
}

8
orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/dto/StudentDto.java
View File

@@ -20,7 +20,7 @@ import java.util.Date;
* @author Jerry
* @date 2020-08-08
*/
@ApiModel("StudentDto实体对象")
@ApiModel("StudentDto对象")
@Data
public class StudentDto {
@@ -117,12 +117,6 @@ public class StudentDto {
@NotNull(message = "数据验证失败，所属校区不能为空！")
private Long schoolId;
/**
* 注册时间。
*/
@ApiModelProperty(value = "注册时间")
private Date registerTime;
/**
* 学生状态 (0: 正常 1: 锁定 2: 注销)。
*/

6
orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/vo/ClassCourseVo.java
View File

@@ -1,5 +1,7 @@
package com.orange.demo.courseclassinterface.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
@@ -8,21 +10,25 @@ import lombok.Data;
* @author Jerry
* @date 2020-08-08
*/
@ApiModel("ClassCourseVO实体对象")
@Data
public class ClassCourseVo {
/**
* 班级Id。
*/
@ApiModelProperty(value = "班级Id")
private Long classId;
/**
* 课程Id。
*/
@ApiModelProperty(value = "课程Id")
private Long courseId;
/**
* 课程顺序(数值越小越靠前)。
*/
@ApiModelProperty(value = "课程顺序(数值越小越靠前)")
private Integer courseOrder;
}

5
orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/vo/ClassStudentVo.java
View File

@@ -1,5 +1,7 @@
package com.orange.demo.courseclassinterface.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
@@ -8,16 +10,19 @@ import lombok.Data;
* @author Jerry
* @date 2020-08-08
*/
@ApiModel("ClassStudentVO实体对象")
@Data
public class ClassStudentVo {
/**
* 班级Id。
*/
@ApiModelProperty(value = "班级Id")
private Long classId;
/**
* 学生Id。
*/
@ApiModelProperty(value = "学生Id")
private Long studentId;
}

8
orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/vo/CourseVo.java
View File

@@ -93,24 +93,24 @@ public class CourseVo {
/**
* courseId 的多对多关联表数据对象，数据对应类型为ClassCourseVo。
*/
@ApiModelProperty(hidden = true)
@ApiModelProperty(value = "courseId 的多对多关联表数据对象，数据对应类型为ClassCourseVo")
private Map<String, Object> classCourse;
/**
* gradeId 字典关联数据。
*/
@ApiModelProperty(hidden = true)
@ApiModelProperty(value = "gradeId 字典关联数据")
private Map<String, Object> gradeIdDictMap;
/**
* difficulty 常量字典关联数据。
*/
@ApiModelProperty(hidden = true)
@ApiModelProperty(value = "difficulty 常量字典关联数据")
private Map<String, Object> difficultyDictMap;
/**
* subjectId 常量字典关联数据。
*/
@ApiModelProperty(hidden = true)
@ApiModelProperty(value = "subjectId 常量字典关联数据")
private Map<String, Object> subjectIdDictMap;
}

4
orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/vo/SchoolInfoVo.java
View File

@@ -43,12 +43,12 @@ public class SchoolInfoVo {
/**
* provinceId 字典关联数据。
*/
@ApiModelProperty(hidden = true)
@ApiModelProperty(value = "provinceId 字典关联数据")
private Map<String, Object> provinceIdDictMap;
/**
* cityId 字典关联数据。
*/
@ApiModelProperty(hidden = true)
@ApiModelProperty(value = "cityId 字典关联数据")
private Map<String, Object> cityIdDictMap;
}

6
orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/vo/StudentClassVo.java
View File

@@ -68,18 +68,18 @@ public class StudentClassVo {
/**
* schoolId 字典关联数据。
*/
@ApiModelProperty(hidden = true)
@ApiModelProperty(value = "schoolId 字典关联数据")
private Map<String, Object> schoolIdDictMap;
/**
* leaderId 字典关联数据。
*/
@ApiModelProperty(hidden = true)
@ApiModelProperty(value = "leaderId 字典关联数据")
private Map<String, Object> leaderIdDictMap;
/**
* classLevel 常量字典关联数据。
*/
@ApiModelProperty(hidden = true)
@ApiModelProperty(value = "classLevel 常量字典关联数据")
private Map<String, Object> classLevelDictMap;
}

16
orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/vo/StudentVo.java
View File

@@ -110,48 +110,48 @@ public class StudentVo {
/**
* provinceId 字典关联数据。
*/
@ApiModelProperty(hidden = true)
@ApiModelProperty(value = "provinceId 字典关联数据")
private Map<String, Object> provinceIdDictMap;
/**
* cityId 字典关联数据。
*/
@ApiModelProperty(hidden = true)
@ApiModelProperty(value = "cityId 字典关联数据")
private Map<String, Object> cityIdDictMap;
/**
* districtId 字典关联数据。
*/
@ApiModelProperty(hidden = true)
@ApiModelProperty(value = "districtId 字典关联数据")
private Map<String, Object> districtIdDictMap;
/**
* gradeId 字典关联数据。
*/
@ApiModelProperty(hidden = true)
@ApiModelProperty(value = "gradeId 字典关联数据")
private Map<String, Object> gradeIdDictMap;
/**
* schoolId 字典关联数据。
*/
@ApiModelProperty(hidden = true)
@ApiModelProperty(value = "schoolId 字典关联数据")
private Map<String, Object> schoolIdDictMap;
/**
* gender 常量字典关联数据。
*/
@ApiModelProperty(hidden = true)
@ApiModelProperty(value = "gender 常量字典关联数据")
private Map<String, Object> genderDictMap;
/**
* experienceLevel 常量字典关联数据。
*/
@ApiModelProperty(hidden = true)
@ApiModelProperty(value = "experienceLevel 常量字典关联数据")
private Map<String, Object> experienceLevelDictMap;
/**
* status 常量字典关联数据。
*/
@ApiModelProperty(hidden = true)
@ApiModelProperty(value = "status 常量字典关联数据")
private Map<String, Object> statusDictMap;
}