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

commit：权限模块新增分配详情功能

Browse Source
This commit is contained in:
Jerry
2020-11-21 11:35:22 +08:00
parent fcce270119
commit ab470fa0d3
55 changed files with 607 additions and 870 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
orange-demo-single-service-for-app/application/src/main/java/com/orange/demo/app/controller/AreaCodeController.java
View File

@@ -1,6 +1,5 @@
package com.orange.demo.app.controller;
import io.swagger.annotations.Api;
import cn.jimmyshi.beanquery.BeanQuery;
import com.orange.demo.app.model.AreaCode;
import com.orange.demo.app.service.AreaCodeService;
@@ -20,7 +19,6 @@ import java.util.*;
* @author Jerry
* @date 2020-09-24
*/
@Api(tags = "行政区划数据访问接口")
@RestController
@RequestMapping("/admin/app/areaCode")
public class AreaCodeController {
@@ -33,8 +31,8 @@ public class AreaCodeController {
*
* @return 字典形式的行政区划列表。
*/
@GetMapping("/listDictAreaCode")
public ResponseResult<List<Map<String, Object>>> listDictAreaCode() {
@GetMapping("/listDict")
public ResponseResult<List<Map<String, Object>>> listDict() {
List<AreaCode> resultList = areaCodeService.getAllList();
return ResponseResult.success(BeanQuery.select(
"parentId as parentId", "areaId as id", "areaName as name").executeFrom(resultList));
@@ -46,8 +44,8 @@ public class AreaCodeController {
* @param parentId 上级行政区划Id。
* @return 按照字典的形式返回下级行政区划列表。
*/
@GetMapping("/listDictAreaCodeByParentId")
public ResponseResult<List<Map<String, Object>>> listDictAreaCodeByParentId(@RequestParam(required = false) Long parentId) {
@GetMapping("/listDictByParentId")
public ResponseResult<List<Map<String, Object>>> listDictByParentId(@RequestParam(required = false) Long parentId) {
Collection<AreaCode> resultList = areaCodeService.getListByParentId(parentId);
if (CollectionUtils.isEmpty(resultList)) {
return ResponseResult.success(new LinkedList<>());

34
orange-demo-single-service-for-app/application/src/main/java/com/orange/demo/app/controller/CourseController.java
View File

@@ -16,8 +16,6 @@ import com.orange.demo.common.core.annotation.MyRequestBody;
import com.orange.demo.common.core.validator.UpdateGroup;
import com.orange.demo.common.core.cache.SessionCacheHelper;
import com.orange.demo.config.ApplicationConfig;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -33,7 +31,6 @@ import javax.validation.groups.Default;
* @author Jerry
* @date 2020-09-24
*/
@Api(tags = "课程数据管理接口")
@Slf4j
@RestController
@RequestMapping("/admin/app/course")
@@ -54,25 +51,17 @@ public class CourseController {
* @param course 新增对象。
* @return 应答结果对象，包含新增对象主键Id。
*/
@ApiOperationSupport(ignoreParameters = {
"course.courseId",
"course.priceStart",
"course.priceEnd",
"course.classHourStart",
"course.classHourEnd",
"course.createTimeStart",
"course.createTimeEnd"})
@PostMapping("/add")
public ResponseResult<Long> add(@MyRequestBody Course course) {
String errorMessage = MyCommonUtil.getModelValidationError(course);
if (errorMessage != null) {
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATAED_FAILED, errorMessage);
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
}
// 验证关联Id的数据合法性
CallResult callResult = courseService.verifyRelatedData(course, null);
if (!callResult.isSuccess()) {
errorMessage = callResult.getErrorMessage();
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATAED_FAILED, errorMessage);
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
}
course = courseService.saveNew(course);
return ResponseResult.success(course.getCourseId());
@@ -84,23 +73,16 @@ public class CourseController {
* @param course 更新对象。
* @return 应答结果对象。
*/
@ApiOperationSupport(ignoreParameters = {
"course.priceStart",
"course.priceEnd",
"course.classHourStart",
"course.classHourEnd",
"course.createTimeStart",
"course.createTimeEnd"})
@PostMapping("/update")
public ResponseResult<Void> update(@MyRequestBody Course course) {
String errorMessage = MyCommonUtil.getModelValidationError(course, Default.class, UpdateGroup.class);
if (errorMessage != null) {
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATAED_FAILED, errorMessage);
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
}
// 验证关联Id的数据合法性
Course originalCourse = courseService.getById(course.getCourseId());
if (originalCourse == null) {
//NOTE: 修改下面方括号中的话述
// NOTE: 修改下面方括号中的话述
errorMessage = "数据验证失败，当前 [数据] 并不存在，请刷新后重试！";
return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST, errorMessage);
}
@@ -108,7 +90,7 @@ public class CourseController {
CallResult callResult = courseService.verifyRelatedData(course, originalCourse);
if (!callResult.isSuccess()) {
errorMessage = callResult.getErrorMessage();
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATAED_FAILED, errorMessage);
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
}
if (!courseService.update(course, originalCourse)) {
return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST);
@@ -180,7 +162,7 @@ public class CourseController {
}
return ResponseResult.success(course);
}
/**
* 附件文件下载。
* 这里将图片和其他类型的附件文件放到不同的父目录下，主要为了便于今后图片文件的迁移。
@@ -281,8 +263,8 @@ public class CourseController {
* @param filter 过滤对象。
* @return 应答结果对象，包含的数据为 List<Map<String, String>>，map中包含两条记录，key的值分别是id和name，value对应具体数据。
*/
@GetMapping("/listDictCourse")
public ResponseResult<List<Map<String, Object>>> listDictCourse(Course filter) {
@GetMapping("/listDict")
public ResponseResult<List<Map<String, Object>>> listDict(Course filter) {
List<Course> resultList = courseService.getListByFilter(filter, null);
return ResponseResult.success(BeanQuery.select(
"courseId as id", "courseName as name").executeFrom(resultList));

4
orange-demo-single-service-for-app/application/src/main/java/com/orange/demo/app/controller/CourseTransStatsController.java
View File

@@ -7,7 +7,6 @@ import com.orange.demo.common.core.object.*;
import com.orange.demo.common.core.util.*;
import com.orange.demo.common.core.constant.*;
import com.orange.demo.common.core.annotation.MyRequestBody;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -20,7 +19,6 @@ import java.util.*;
* @author Jerry
* @date 2020-09-24
*/
@Api(tags = "课程统计管理接口")
@Slf4j
@RestController
@RequestMapping("/admin/app/courseTransStats")
@@ -62,7 +60,7 @@ public class CourseTransStatsController {
@PostMapping("/listWithGroup")
public ResponseResult<MyPageData<CourseTransStats>> listWithGroup(
@MyRequestBody CourseTransStats courseTransStatsFilter,
@MyRequestBody MyGroupParam groupParam,
@MyRequestBody(required = true) MyGroupParam groupParam,
@MyRequestBody MyOrderParam orderParam,
@MyRequestBody MyPageParam pageParam) {
String orderBy = MyOrderParam.buildOrderBy(orderParam, CourseTransStats.class);

12
orange-demo-single-service-for-app/application/src/main/java/com/orange/demo/app/controller/GradeController.java
View File

@@ -8,8 +8,6 @@ import com.orange.demo.common.core.object.ResponseResult;
import com.orange.demo.common.core.annotation.MyRequestBody;
import com.orange.demo.common.core.validator.UpdateGroup;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -24,7 +22,6 @@ import java.util.*;
* @author Jerry
* @date 2020-09-24
*/
@Api(tags = "年级管理接口")
@Slf4j
@RestController
@RequestMapping("/admin/app/grade")
@@ -39,12 +36,11 @@ public class GradeController {
* @param grade 新增对象。
* @return 应答结果对象，包含新增对象主键Id。
*/
@ApiOperationSupport(ignoreParameters = {"grade.gradeId"})
@PostMapping("/add")
public ResponseResult<Integer> add(@MyRequestBody Grade grade) {
String errorMessage = MyCommonUtil.getModelValidationError(grade);
if (errorMessage != null) {
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATAED_FAILED, errorMessage);
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
}
grade = gradeService.saveNew(grade);
return ResponseResult.success(grade.getGradeId());
@@ -60,7 +56,7 @@ public class GradeController {
public ResponseResult<Void> update(@MyRequestBody Grade grade) {
String errorMessage = MyCommonUtil.getModelValidationError(grade, Default.class, UpdateGroup.class);
if (errorMessage != null) {
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATAED_FAILED, errorMessage);
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
}
Grade originalGrade = gradeService.getById(grade.getGradeId());
if (originalGrade == null) {
@@ -95,8 +91,8 @@ public class GradeController {
*
* @return 应答结果对象，包含字典形式的数据集合。
*/
@GetMapping("/listDictGrade")
public ResponseResult<List<Map<String, Object>>> listDictGrade() {
@GetMapping("/listDict")
public ResponseResult<List<Map<String, Object>>> listDict() {
List<Grade> resultList = gradeService.getAllList();
return ResponseResult.success(BeanQuery.select(
"gradeId as id", "gradeName as name").executeFrom(resultList));

18
orange-demo-single-service-for-app/application/src/main/java/com/orange/demo/app/controller/SchoolInfoController.java
View File

@@ -9,8 +9,6 @@ import com.orange.demo.common.core.util.*;
import com.orange.demo.common.core.constant.*;
import com.orange.demo.common.core.annotation.MyRequestBody;
import com.orange.demo.common.core.validator.UpdateGroup;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -24,7 +22,6 @@ import javax.validation.groups.Default;
* @author Jerry
* @date 2020-09-24
*/
@Api(tags = "校区数据管理接口")
@Slf4j
@RestController
@RequestMapping("/admin/app/schoolInfo")
@@ -39,18 +36,17 @@ public class SchoolInfoController {
* @param schoolInfo 新增对象。
* @return 应答结果对象，包含新增对象主键Id。
*/
@ApiOperationSupport(ignoreParameters = {"schoolInfo.userId"})
@PostMapping("/add")
public ResponseResult<Long> add(@MyRequestBody SchoolInfo schoolInfo) {
String errorMessage = MyCommonUtil.getModelValidationError(schoolInfo);
if (errorMessage != null) {
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATAED_FAILED, errorMessage);
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
}
// 验证关联Id的数据合法性
CallResult callResult = schoolInfoService.verifyRelatedData(schoolInfo, null);
if (!callResult.isSuccess()) {
errorMessage = callResult.getErrorMessage();
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATAED_FAILED, errorMessage);
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
}
schoolInfo = schoolInfoService.saveNew(schoolInfo);
return ResponseResult.success(schoolInfo.getSchoolId());
@@ -66,12 +62,12 @@ public class SchoolInfoController {
public ResponseResult<Void> update(@MyRequestBody SchoolInfo schoolInfo) {
String errorMessage = MyCommonUtil.getModelValidationError(schoolInfo, Default.class, UpdateGroup.class);
if (errorMessage != null) {
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATAED_FAILED, errorMessage);
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
}
// 验证关联Id的数据合法性
SchoolInfo originalSchoolInfo = schoolInfoService.getById(schoolInfo.getSchoolId());
if (originalSchoolInfo == null) {
//NOTE: 修改下面方括号中的话述
// NOTE: 修改下面方括号中的话述
errorMessage = "数据验证失败，当前 [数据] 并不存在，请刷新后重试！";
return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST, errorMessage);
}
@@ -79,7 +75,7 @@ public class SchoolInfoController {
CallResult callResult = schoolInfoService.verifyRelatedData(schoolInfo, originalSchoolInfo);
if (!callResult.isSuccess()) {
errorMessage = callResult.getErrorMessage();
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATAED_FAILED, errorMessage);
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
}
if (!schoolInfoService.update(schoolInfo, originalSchoolInfo)) {
return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST);
@@ -159,8 +155,8 @@ public class SchoolInfoController {
* @param filter 过滤对象。
* @return 应答结果对象，包含的数据为 List<Map<String, String>>，map中包含两条记录，key的值分别是id和name，value对应具体数据。
*/
@GetMapping("/listDictSchoolInfo")
public ResponseResult<List<Map<String, Object>>> listDictSchoolInfo(SchoolInfo filter) {
@GetMapping("/listDict")
public ResponseResult<List<Map<String, Object>>> listDict(SchoolInfo filter) {
List<SchoolInfo> resultList = schoolInfoService.getListByFilter(filter, null);
return ResponseResult.success(BeanQuery.select(
"schoolId as id", "schoolName as name").executeFrom(resultList));

4
orange-demo-single-service-for-app/application/src/main/java/com/orange/demo/app/controller/StudentActionStatsController.java
View File

@@ -7,7 +7,6 @@ import com.orange.demo.common.core.object.*;
import com.orange.demo.common.core.util.*;
import com.orange.demo.common.core.constant.*;
import com.orange.demo.common.core.annotation.MyRequestBody;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -20,7 +19,6 @@ import java.util.*;
* @author Jerry
* @date 2020-09-24
*/
@Api(tags = "学生行为统计管理接口")
@Slf4j
@RestController
@RequestMapping("/admin/app/studentActionStats")
@@ -62,7 +60,7 @@ public class StudentActionStatsController {
@PostMapping("/listWithGroup")
public ResponseResult<MyPageData<StudentActionStats>> listWithGroup(
@MyRequestBody StudentActionStats studentActionStatsFilter,
@MyRequestBody MyGroupParam groupParam,
@MyRequestBody(required = true) MyGroupParam groupParam,
@MyRequestBody MyOrderParam orderParam,
@MyRequestBody MyPageParam pageParam) {
String orderBy = MyOrderParam.buildOrderBy(orderParam, StudentActionStats.class);

20
orange-demo-single-service-for-app/application/src/main/java/com/orange/demo/app/controller/StudentActionTransController.java
View File

@@ -8,8 +8,6 @@ import com.orange.demo.common.core.util.*;
import com.orange.demo.common.core.constant.*;
import com.orange.demo.common.core.annotation.MyRequestBody;
import com.orange.demo.common.core.validator.UpdateGroup;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -23,7 +21,6 @@ import javax.validation.groups.Default;
* @author Jerry
* @date 2020-09-24
*/
@Api(tags = "学生行为流水管理接口")
@Slf4j
@RestController
@RequestMapping("/admin/app/studentActionTrans")
@@ -38,21 +35,17 @@ public class StudentActionTransController {
* @param studentActionTrans 新增对象。
* @return 应答结果对象，包含新增对象主键Id。
*/
@ApiOperationSupport(ignoreParameters = {
"studentActionTrans.transId",
"studentActionTrans.createTimeStart",
"studentActionTrans.createTimeEnd"})
@PostMapping("/add")
public ResponseResult<Long> add(@MyRequestBody StudentActionTrans studentActionTrans) {
String errorMessage = MyCommonUtil.getModelValidationError(studentActionTrans);
if (errorMessage != null) {
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATAED_FAILED, errorMessage);
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
}
// 验证关联Id的数据合法性
CallResult callResult = studentActionTransService.verifyRelatedData(studentActionTrans, null);
if (!callResult.isSuccess()) {
errorMessage = callResult.getErrorMessage();
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATAED_FAILED, errorMessage);
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
}
studentActionTrans = studentActionTransService.saveNew(studentActionTrans);
return ResponseResult.success(studentActionTrans.getTransId());
@@ -64,19 +57,16 @@ public class StudentActionTransController {
* @param studentActionTrans 更新对象。
* @return 应答结果对象。
*/
@ApiOperationSupport(ignoreParameters = {
"studentActionTrans.createTimeStart",
"studentActionTrans.createTimeEnd"})
@PostMapping("/update")
public ResponseResult<Void> update(@MyRequestBody StudentActionTrans studentActionTrans) {
String errorMessage = MyCommonUtil.getModelValidationError(studentActionTrans, Default.class, UpdateGroup.class);
if (errorMessage != null) {
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATAED_FAILED, errorMessage);
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
}
// 验证关联Id的数据合法性
StudentActionTrans originalStudentActionTrans = studentActionTransService.getById(studentActionTrans.getTransId());
if (originalStudentActionTrans == null) {
//NOTE: 修改下面方括号中的话述
// NOTE: 修改下面方括号中的话述
errorMessage = "数据验证失败，当前 [数据] 并不存在，请刷新后重试！";
return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST, errorMessage);
}
@@ -84,7 +74,7 @@ public class StudentActionTransController {
CallResult callResult = studentActionTransService.verifyRelatedData(studentActionTrans, originalStudentActionTrans);
if (!callResult.isSuccess()) {
errorMessage = callResult.getErrorMessage();
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATAED_FAILED, errorMessage);
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
}
if (!studentActionTransService.update(studentActionTrans, originalStudentActionTrans)) {
return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST);

20
orange-demo-single-service-for-app/application/src/main/java/com/orange/demo/app/controller/StudentClassController.java
View File

@@ -8,8 +8,6 @@ import com.orange.demo.common.core.util.*;
import com.orange.demo.common.core.constant.*;
import com.orange.demo.common.core.annotation.MyRequestBody;
import com.orange.demo.common.core.validator.UpdateGroup;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -24,7 +22,6 @@ import java.util.stream.Collectors;
* @author Jerry
* @date 2020-09-24
*/
@Api(tags = "班级数据管理接口")
@Slf4j
@RestController
@RequestMapping("/admin/app/studentClass")
@@ -43,18 +40,17 @@ public class StudentClassController {
* @param studentClass 新增对象。
* @return 应答结果对象，包含新增对象主键Id。
*/
@ApiOperationSupport(ignoreParameters = {"studentClass.userId"})
@PostMapping("/add")
public ResponseResult<Long> add(@MyRequestBody StudentClass studentClass) {
String errorMessage = MyCommonUtil.getModelValidationError(studentClass);
if (errorMessage != null) {
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATAED_FAILED, errorMessage);
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
}
// 验证关联Id的数据合法性
CallResult callResult = studentClassService.verifyRelatedData(studentClass, null);
if (!callResult.isSuccess()) {
errorMessage = callResult.getErrorMessage();
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATAED_FAILED, errorMessage);
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
}
studentClass = studentClassService.saveNew(studentClass);
return ResponseResult.success(studentClass.getClassId());
@@ -70,12 +66,12 @@ public class StudentClassController {
public ResponseResult<Void> update(@MyRequestBody StudentClass studentClass) {
String errorMessage = MyCommonUtil.getModelValidationError(studentClass, Default.class, UpdateGroup.class);
if (errorMessage != null) {
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATAED_FAILED, errorMessage);
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
}
// 验证关联Id的数据合法性
StudentClass originalStudentClass = studentClassService.getById(studentClass.getClassId());
if (originalStudentClass == null) {
//NOTE: 修改下面方括号中的话述
// NOTE: 修改下面方括号中的话述
errorMessage = "数据验证失败，当前 [数据] 并不存在，请刷新后重试！";
return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST, errorMessage);
}
@@ -83,7 +79,7 @@ public class StudentClassController {
CallResult callResult = studentClassService.verifyRelatedData(studentClass, originalStudentClass);
if (!callResult.isSuccess()) {
errorMessage = callResult.getErrorMessage();
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATAED_FAILED, errorMessage);
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
}
if (!studentClassService.update(studentClass, originalStudentClass)) {
return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST);
@@ -239,7 +235,7 @@ public class StudentClassController {
for (ClassCourse classCourse : classCourseList) {
String errorMessage = MyCommonUtil.getModelValidationError(classCourse);
if (errorMessage != null) {
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATAED_FAILED, errorMessage);
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
}
}
Set<Long> courseIdSet =
@@ -262,7 +258,7 @@ public class StudentClassController {
public ResponseResult<Void> updateClassCourse(@MyRequestBody ClassCourse classCourse) {
String errorMessage = MyCommonUtil.getModelValidationError(classCourse);
if (errorMessage != null) {
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATAED_FAILED, errorMessage);
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
}
if (!studentClassService.updateClassCourse(classCourse)) {
return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST);
@@ -392,7 +388,7 @@ public class StudentClassController {
for (ClassStudent classStudent : classStudentList) {
String errorMessage = MyCommonUtil.getModelValidationError(classStudent);
if (errorMessage != null) {
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATAED_FAILED, errorMessage);
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
}
}
Set<Long> studentIdSet =

30
orange-demo-single-service-for-app/application/src/main/java/com/orange/demo/app/controller/StudentController.java
View File

@@ -9,8 +9,6 @@ import com.orange.demo.common.core.util.*;
import com.orange.demo.common.core.constant.*;
import com.orange.demo.common.core.annotation.MyRequestBody;
import com.orange.demo.common.core.validator.UpdateGroup;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -24,7 +22,6 @@ import javax.validation.groups.Default;
* @author Jerry
* @date 2020-09-24
*/
@Api(tags = "学生数据管理接口")
@Slf4j
@RestController
@RequestMapping("/admin/app/student")
@@ -39,24 +36,17 @@ public class StudentController {
* @param student 新增对象。
* @return 应答结果对象，包含新增对象主键Id。
*/
@ApiOperationSupport(ignoreParameters = {
"student.studentId",
"student.searchString",
"student.birthdayStart",
"student.birthdayEnd",
"student.registerTimeStart",
"student.registerTimeEnd"})
@PostMapping("/add")
public ResponseResult<Long> add(@MyRequestBody Student student) {
String errorMessage = MyCommonUtil.getModelValidationError(student);
if (errorMessage != null) {
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATAED_FAILED, errorMessage);
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
}
// 验证关联Id的数据合法性
CallResult callResult = studentService.verifyRelatedData(student, null);
if (!callResult.isSuccess()) {
errorMessage = callResult.getErrorMessage();
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATAED_FAILED, errorMessage);
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
}
student = studentService.saveNew(student);
return ResponseResult.success(student.getStudentId());
@@ -68,22 +58,16 @@ public class StudentController {
* @param student 更新对象。
* @return 应答结果对象。
*/
@ApiOperationSupport(ignoreParameters = {
"student.searchString",
"student.birthdayStart",
"student.birthdayEnd",
"student.registerTimeStart",
"student.registerTimeEnd"})
@PostMapping("/update")
public ResponseResult<Void> update(@MyRequestBody Student student) {
String errorMessage = MyCommonUtil.getModelValidationError(student, Default.class, UpdateGroup.class);
if (errorMessage != null) {
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATAED_FAILED, errorMessage);
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
}
// 验证关联Id的数据合法性
Student originalStudent = studentService.getById(student.getStudentId());
if (originalStudent == null) {
//NOTE: 修改下面方括号中的话述
// NOTE: 修改下面方括号中的话述
errorMessage = "数据验证失败，当前 [数据] 并不存在，请刷新后重试！";
return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST, errorMessage);
}
@@ -91,7 +75,7 @@ public class StudentController {
CallResult callResult = studentService.verifyRelatedData(student, originalStudent);
if (!callResult.isSuccess()) {
errorMessage = callResult.getErrorMessage();
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATAED_FAILED, errorMessage);
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
}
if (!studentService.update(student, originalStudent)) {
return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST);
@@ -171,8 +155,8 @@ public class StudentController {
* @param filter 过滤对象。
* @return 应答结果对象，包含的数据为 List<Map<String, String>>，map中包含两条记录，key的值分别是id和name，value对应具体数据。
*/
@GetMapping("/listDictStudent")
public ResponseResult<List<Map<String, Object>>> listDictStudent(Student filter) {
@GetMapping("/listDict")
public ResponseResult<List<Map<String, Object>>> listDict(Student filter) {
List<Student> resultList = studentService.getListByFilter(filter, null);
return ResponseResult.success(BeanQuery.select(
"studentId as id", "studentName as name").executeFrom(resultList));

7
orange-demo-single-service-for-app/application/src/main/java/com/orange/demo/app/model/AreaCode.java
View File

@@ -1,7 +1,5 @@
package com.orange.demo.app.model;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.persistence.*;
@@ -12,7 +10,6 @@ import javax.persistence.*;
* @author Jerry
* @date 2020-09-24
*/
@ApiModel("行政区划实体对象")
@Data
@Table(name = "zz_area_code")
public class AreaCode {
@@ -20,7 +17,6 @@ public class AreaCode {
/**
* 行政区划主键Id
*/
@ApiModelProperty(value = "行政区划主键Id", required = true)
@Id
@Column(name = "area_id")
private Long areaId;
@@ -28,21 +24,18 @@ public class AreaCode {
/**
* 行政区划名称
*/
@ApiModelProperty(value = "行政区划名称")
@Column(name = "area_name")
private String areaName;
/**
* 行政区划级别 (1: 省级别 2: 市级别 3: 区级别)
*/
@ApiModelProperty(value = "行政区划级别")
@Column(name = "area_level")
private Integer areaLevel;
/**
* 父级行政区划Id
*/
@ApiModelProperty(value = "父级行政区划Id")
@Column(name = "parent_id")
private Long parentId;
}

6
orange-demo-single-service-for-app/application/src/main/java/com/orange/demo/app/model/ClassCourse.java
View File

@@ -1,8 +1,6 @@
package com.orange.demo.app.model;
import com.orange.demo.common.core.validator.UpdateGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.persistence.*;
import javax.validation.constraints.*;
@@ -13,7 +11,6 @@ import javax.validation.constraints.*;
* @author Jerry
* @date 2020-09-24
*/
@ApiModel("ClassCourse实体对象")
@Data
@Table(name = "zz_class_course")
public class ClassCourse {
@@ -21,7 +18,6 @@ public class ClassCourse {
/**
* 班级Id。
*/
@ApiModelProperty(value = "班级Id", required = true)
@NotNull(message = "数据验证失败，班级Id不能为空！", groups = {UpdateGroup.class})
@Id
@Column(name = "class_id")
@@ -30,7 +26,6 @@ public class ClassCourse {
/**
* 课程Id。
*/
@ApiModelProperty(value = "课程Id", required = true)
@NotNull(message = "数据验证失败，课程Id不能为空！", groups = {UpdateGroup.class})
@Id
@Column(name = "course_id")
@@ -39,7 +34,6 @@ public class ClassCourse {
/**
* 课程顺序(数值越小越靠前)。
*/
@ApiModelProperty(value = "课程顺序(数值越小越靠前)", required = true)
@NotNull(message = "数据验证失败，课程顺序(数值越小越靠前)不能为空！", groups = {UpdateGroup.class})
@Column(name = "course_order")
private Integer courseOrder;

5
orange-demo-single-service-for-app/application/src/main/java/com/orange/demo/app/model/ClassStudent.java
View File

@@ -1,8 +1,6 @@
package com.orange.demo.app.model;
import com.orange.demo.common.core.validator.UpdateGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.persistence.*;
import javax.validation.constraints.*;
@@ -13,7 +11,6 @@ import javax.validation.constraints.*;
* @author Jerry
* @date 2020-09-24
*/
@ApiModel("ClassStudent实体对象")
@Data
@Table(name = "zz_class_student")
public class ClassStudent {
@@ -21,7 +18,6 @@ public class ClassStudent {
/**
* 班级Id。
*/
@ApiModelProperty(value = "班级Id", required = true)
@NotNull(message = "数据验证失败，班级Id不能为空！", groups = {UpdateGroup.class})
@Id
@Column(name = "class_id")
@@ -30,7 +26,6 @@ public class ClassStudent {
/**
* 学生Id。
*/
@ApiModelProperty(value = "学生Id", required = true)
@NotNull(message = "数据验证失败，学生Id不能为空！", groups = {UpdateGroup.class})
@Id
@Column(name = "student_id")

25
orange-demo-single-service-for-app/application/src/main/java/com/orange/demo/app/model/Course.java
View File

@@ -8,8 +8,6 @@ import com.orange.demo.common.core.annotation.RelationDict;
import com.orange.demo.common.core.annotation.RelationConstDict;
import com.orange.demo.common.core.validator.UpdateGroup;
import com.orange.demo.common.core.validator.ConstDictRef;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.persistence.*;
import javax.validation.constraints.*;
@@ -24,7 +22,6 @@ import java.util.Map;
* @author Jerry
* @date 2020-09-24
*/
@ApiModel("Course实体对象")
@Data
@Table(name = "zz_course")
public class Course {
@@ -32,7 +29,6 @@ public class Course {
/**
* 主键Id。
*/
@ApiModelProperty(value = "主键Id", required = true)
@NotNull(message = "数据验证失败，主键Id不能为空！", groups = {UpdateGroup.class})
@Id
@Column(name = "course_id")
@@ -41,7 +37,6 @@ public class Course {
/**
* 课程名称。
*/
@ApiModelProperty(value = "课程名称", required = true)
@NotBlank(message = "数据验证失败，课程名称不能为空！")
@Column(name = "course_name")
private String courseName;
@@ -49,20 +44,17 @@ public class Course {
/**
* 课程价格。
*/
@ApiModelProperty(value = "课程价格", required = true)
@NotNull(message = "数据验证失败，课程价格不能为空！")
private BigDecimal price;
/**
* 课程描述。
*/
@ApiModelProperty(value = "课程描述")
private String description;
/**
* 课程难度(0: 容易 1: 普通 2: 很难)。
*/
@ApiModelProperty(value = "课程难度(0: 容易 1: 普通 2: 很难)", required = true)
@NotNull(message = "数据验证失败，课程难度不能为空！")
@ConstDictRef(constDictClass = CourseDifficult.class, message = "数据验证失败，课程难度为无效值！")
private Integer difficulty;
@@ -70,7 +62,6 @@ public class Course {
/**
* 年级Id。
*/
@ApiModelProperty(value = "年级Id", required = true)
@NotNull(message = "数据验证失败，所属年级不能为空！")
@Column(name = "grade_id")
private Integer gradeId;
@@ -78,7 +69,6 @@ public class Course {
/**
* 学科Id。
*/
@ApiModelProperty(value = "学科Id", required = true)
@NotNull(message = "数据验证失败，所属学科不能为空！")
@ConstDictRef(constDictClass = Subject.class, message = "数据验证失败，所属学科为无效值！")
@Column(name = "subject_id")
@@ -87,7 +77,6 @@ public class Course {
/**
* 课时数量。
*/
@ApiModelProperty(value = "课时数量", required = true)
@NotNull(message = "数据验证失败，课时数量不能为空！")
@Column(name = "class_hour")
private Integer classHour;
@@ -95,7 +84,6 @@ public class Course {
/**
* 多张课程图片地址。
*/
@ApiModelProperty(value = "多张课程图片地址", required = true)
@UploadFlagColumn(storeType = UploadStoreTypeEnum.LOCAL_SYSTEM)
@NotBlank(message = "数据验证失败，课程图片不能为空！")
@Column(name = "picture_url")
@@ -104,74 +92,63 @@ public class Course {
/**
* 创建用户Id。
*/
@ApiModelProperty(value = "创建用户Id")
@Column(name = "create_user_id")
private Long createUserId;
/**
* 创建时间。
*/
@ApiModelProperty(value = "创建时间")
@Column(name = "create_time")
private Date createTime;
/**
* 最后修改时间。
*/
@ApiModelProperty(value = "最后修改时间")
@Column(name = "update_time")
private Date updateTime;
/**
* price 范围过滤起始值(>=)。
*/
@ApiModelProperty(value = "price 范围过滤起始值(>=)")
@Transient
private BigDecimal priceStart;
/**
* price 范围过滤结束值(<=)。
*/
@ApiModelProperty(value = "price 范围过滤结束值(<=)")
@Transient
private BigDecimal priceEnd;
/**
* classHour 范围过滤起始值(>=)。
*/
@ApiModelProperty(value = "classHour 范围过滤起始值(>=)")
@Transient
private Integer classHourStart;
/**
* classHour 范围过滤结束值(<=)。
*/
@ApiModelProperty(value = "classHour 范围过滤结束值(<=)")
@Transient
private Integer classHourEnd;
/**
* createTime 范围过滤起始值(>=)。
*/
@ApiModelProperty(value = "createTime 范围过滤起始值(>=)")
@Transient
private String createTimeStart;
/**
* createTime 范围过滤结束值(<=)。
*/
@ApiModelProperty(value = "createTime 范围过滤结束值(<=)")
@Transient
private String createTimeEnd;
/**
* courseId 的多对多关联表数据对象。
*/
@ApiModelProperty(hidden = true)
@Transient
private ClassCourse classCourse;
@ApiModelProperty(hidden = true)
@RelationDict(
masterIdField = "gradeId",
slaveServiceName = "gradeService",
@@ -181,14 +158,12 @@ public class Course {
@Transient
private Map<String, Object> gradeIdDictMap;
@ApiModelProperty(hidden = true)
@RelationConstDict(
masterIdField = "difficulty",
constantDictClass = CourseDifficult.class)
@Transient
private Map<String, Object> difficultyDictMap;
@ApiModelProperty(hidden = true)
@RelationConstDict(
masterIdField = "subjectId",
constantDictClass = Subject.class)

17
orange-demo-single-service-for-app/application/src/main/java/com/orange/demo/app/model/CourseTransStats.java
View File

@@ -5,8 +5,6 @@ import com.orange.demo.common.core.annotation.RelationDict;
import com.orange.demo.common.core.annotation.RelationConstDict;
import com.orange.demo.common.core.validator.UpdateGroup;
import com.orange.demo.common.core.validator.ConstDictRef;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.persistence.*;
import javax.validation.constraints.*;
@@ -20,7 +18,6 @@ import java.util.Map;
* @author Jerry
* @date 2020-09-24
*/
@ApiModel("CourseTransStats实体对象")
@Data
@Table(name = "zz_course_trans_stats")
public class CourseTransStats {
@@ -28,7 +25,6 @@ public class CourseTransStats {
/**
* 主键Id。
*/
@ApiModelProperty(value = "主键Id", required = true)
@NotNull(message = "数据验证失败，主键Id不能为空！", groups = {UpdateGroup.class})
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -38,7 +34,6 @@ public class CourseTransStats {
/**
* 统计日期。
*/
@ApiModelProperty(value = "统计日期", required = true)
@NotNull(message = "数据验证失败，统计日期不能为空！")
@Column(name = "stats_date")
private Date statsDate;
@@ -46,7 +41,6 @@ public class CourseTransStats {
/**
* 科目Id。
*/
@ApiModelProperty(value = "科目Id", required = true)
@NotNull(message = "数据验证失败，所属科目不能为空！")
@ConstDictRef(constDictClass = Subject.class, message = "数据验证失败，所属科目为无效值！")
@Column(name = "subject_id")
@@ -55,7 +49,6 @@ public class CourseTransStats {
/**
* 年级Id。
*/
@ApiModelProperty(value = "年级Id", required = true)
@NotNull(message = "数据验证失败，所属年级不能为空！")
@Column(name = "grade_id")
private Integer gradeId;
@@ -63,14 +56,12 @@ public class CourseTransStats {
/**
* 年级名称。
*/
@ApiModelProperty(value = "年级名称")
@Column(name = "grade_name")
private String gradeName;
/**
* 课程Id。
*/
@ApiModelProperty(value = "课程Id", required = true)
@NotNull(message = "数据验证失败，课程Id不能为空！")
@Column(name = "course_id")
private Long courseId;
@@ -78,14 +69,12 @@ public class CourseTransStats {
/**
* 课程名称。
*/
@ApiModelProperty(value = "课程名称")
@Column(name = "course_name")
private String courseName;
/**
* 学生上课次数。
*/
@ApiModelProperty(value = "学生上课次数", required = true)
@NotNull(message = "数据验证失败，上课次数不能为空！")
@Column(name = "student_attend_count")
private Integer studentAttendCount;
@@ -93,7 +82,6 @@ public class CourseTransStats {
/**
* 学生献花数量。
*/
@ApiModelProperty(value = "学生献花数量", required = true)
@NotNull(message = "数据验证失败，献花数量不能为空！")
@Column(name = "student_flower_amount")
private Integer studentFlowerAmount;
@@ -101,7 +89,6 @@ public class CourseTransStats {
/**
* 学生献花次数。
*/
@ApiModelProperty(value = "学生献花次数", required = true)
@NotNull(message = "数据验证失败，献花次数不能为空！")
@Column(name = "student_flower_count")
private Integer studentFlowerCount;
@@ -109,18 +96,15 @@ public class CourseTransStats {
/**
* statsDate 范围过滤起始值(>=)。
*/
@ApiModelProperty(value = "statsDate 范围过滤起始值(>=)")
@Transient
private String statsDateStart;
/**
* statsDate 范围过滤结束值(<=)。
*/
@ApiModelProperty(value = "statsDate 范围过滤结束值(<=)")
@Transient
private String statsDateEnd;
@ApiModelProperty(hidden = true)
@RelationDict(
masterIdField = "gradeId",
slaveServiceName = "gradeService",
@@ -130,7 +114,6 @@ public class CourseTransStats {
@Transient
private Map<String, Object> gradeIdDictMap;
@ApiModelProperty(hidden = true)
@RelationConstDict(
masterIdField = "subjectId",
constantDictClass = Subject.class)

6
orange-demo-single-service-for-app/application/src/main/java/com/orange/demo/app/model/Grade.java
View File

@@ -3,8 +3,6 @@ package com.orange.demo.app.model;
import com.alibaba.fastjson.annotation.JSONField;
import com.orange.demo.common.core.annotation.DeletedFlagColumn;
import com.orange.demo.common.core.validator.UpdateGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.persistence.*;
import javax.validation.constraints.*;
@@ -15,7 +13,6 @@ import javax.validation.constraints.*;
* @author Jerry
* @date 2020-09-24
*/
@ApiModel("Grade实体对象")
@Data
@Table(name = "zz_grade")
public class Grade {
@@ -23,7 +20,6 @@ public class Grade {
/**
* 主键Id。
*/
@ApiModelProperty(value = "主键Id", required = true)
@NotNull(message = "数据验证失败，主键Id不能为空！", groups = {UpdateGroup.class})
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -33,7 +29,6 @@ public class Grade {
/**
* 年级名称。
*/
@ApiModelProperty(value = "年级名称", required = true)
@NotBlank(message = "数据验证失败，年级名称不能为空！")
@Column(name = "grade_name")
private String gradeName;
@@ -41,7 +36,6 @@ public class Grade {
/**
* 逻辑删除标记字段(1: 正常 -1: 已删除)。
*/
@ApiModelProperty(hidden = true)
@JSONField(serialize = false)
@DeletedFlagColumn
private Integer status;

6
orange-demo-single-service-for-app/application/src/main/java/com/orange/demo/app/model/MaterialEdition.java
View File

@@ -1,8 +1,6 @@
package com.orange.demo.app.model;
import com.orange.demo.common.core.validator.UpdateGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.persistence.*;
import javax.validation.constraints.*;
@@ -13,7 +11,6 @@ import javax.validation.constraints.*;
* @author Jerry
* @date 2020-09-24
*/
@ApiModel("MaterialEdition实体对象")
@Data
@Table(name = "zz_material_edition")
public class MaterialEdition {
@@ -21,7 +18,6 @@ public class MaterialEdition {
/**
* 主键Id。
*/
@ApiModelProperty(value = "主键Id", required = true)
@NotNull(message = "数据验证失败，主键Id不能为空！", groups = {UpdateGroup.class})
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -31,7 +27,6 @@ public class MaterialEdition {
/**
* 教材版本名称。
*/
@ApiModelProperty(value = "教材版本名称", required = true)
@NotBlank(message = "数据验证失败，教材版本名称不能为空！")
@Column(name = "edition_name")
private String editionName;
@@ -39,7 +34,6 @@ public class MaterialEdition {
/**
* 是否正在使用（0：不是，1：是）。
*/
@ApiModelProperty(value = "是否正在使用（0：不是，1：是）", required = true)
@NotNull(message = "数据验证失败，是否正在使用（0：不是，1：是）不能为空！")
private Integer status;
}

9
orange-demo-single-service-for-app/application/src/main/java/com/orange/demo/app/model/SchoolInfo.java
View File

@@ -2,8 +2,6 @@ package com.orange.demo.app.model;
import com.orange.demo.common.core.annotation.RelationDict;
import com.orange.demo.common.core.validator.UpdateGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.persistence.*;
import javax.validation.constraints.*;
@@ -16,7 +14,6 @@ import java.util.Map;
* @author Jerry
* @date 2020-09-24
*/
@ApiModel("SchoolInfo实体对象")
@Data
@Table(name = "zz_school_info")
public class SchoolInfo {
@@ -24,7 +21,6 @@ public class SchoolInfo {
/**
* 学校Id。
*/
@ApiModelProperty(value = "学校Id", required = true)
@NotNull(message = "数据验证失败，学校Id不能为空！", groups = {UpdateGroup.class})
@Id
@Column(name = "school_id")
@@ -33,7 +29,6 @@ public class SchoolInfo {
/**
* 学校名称。
*/
@ApiModelProperty(value = "学校名称", required = true)
@NotBlank(message = "数据验证失败，学校名称不能为空！")
@Column(name = "school_name")
private String schoolName;
@@ -41,7 +36,6 @@ public class SchoolInfo {
/**
* 所在省Id。
*/
@ApiModelProperty(value = "所在省Id", required = true)
@NotNull(message = "数据验证失败，所在省份不能为空！")
@Column(name = "province_id")
private Long provinceId;
@@ -49,12 +43,10 @@ public class SchoolInfo {
/**
* 所在城市Id。
*/
@ApiModelProperty(value = "所在城市Id", required = true)
@NotNull(message = "数据验证失败，所在城市不能为空！")
@Column(name = "city_id")
private Long cityId;
@ApiModelProperty(hidden = true)
@RelationDict(
masterIdField = "provinceId",
slaveServiceName = "areaCodeService",
@@ -64,7 +56,6 @@ public class SchoolInfo {
@Transient
private Map<String, Object> provinceIdDictMap;
@ApiModelProperty(hidden = true)
@RelationDict(
masterIdField = "cityId",
slaveServiceName = "areaCodeService",

31
orange-demo-single-service-for-app/application/src/main/java/com/orange/demo/app/model/Student.java
View File

@@ -7,8 +7,6 @@ import com.orange.demo.common.core.annotation.RelationDict;
import com.orange.demo.common.core.annotation.RelationConstDict;
import com.orange.demo.common.core.validator.UpdateGroup;
import com.orange.demo.common.core.validator.ConstDictRef;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.persistence.*;
import javax.validation.constraints.*;
@@ -22,7 +20,6 @@ import java.util.Map;
* @author Jerry
* @date 2020-09-24
*/
@ApiModel("Student实体对象")
@Data
@Table(name = "zz_student")
public class Student {
@@ -30,7 +27,6 @@ public class Student {
/**
* 学生Id。
*/
@ApiModelProperty(value = "学生Id", required = true)
@NotNull(message = "数据验证失败，学生Id不能为空！", groups = {UpdateGroup.class})
@Id
@Column(name = "student_id")
@@ -39,7 +35,6 @@ public class Student {
/**
* 登录手机。
*/
@ApiModelProperty(value = "登录手机", required = true)
@NotBlank(message = "数据验证失败，手机号码不能为空！")
@Column(name = "login_mobile")
private String loginMobile;
@@ -47,7 +42,6 @@ public class Student {
/**
* 学生姓名。
*/
@ApiModelProperty(value = "学生姓名", required = true)
@NotBlank(message = "数据验证失败，学生姓名不能为空！")
@Column(name = "student_name")
private String studentName;
@@ -55,7 +49,6 @@ public class Student {
/**
* 所在省份Id。
*/
@ApiModelProperty(value = "所在省份Id", required = true)
@NotNull(message = "数据验证失败，所在省份不能为空！")
@Column(name = "province_id")
private Long provinceId;
@@ -63,7 +56,6 @@ public class Student {
/**
* 所在城市Id。
*/
@ApiModelProperty(value = "所在城市Id", required = true)
@NotNull(message = "数据验证失败，所在城市不能为空！")
@Column(name = "city_id")
private Long cityId;
@@ -71,7 +63,6 @@ public class Student {
/**
* 区县Id。
*/
@ApiModelProperty(value = "区县Id", required = true)
@NotNull(message = "数据验证失败，所在区县不能为空！")
@Column(name = "district_id")
private Long districtId;
@@ -79,7 +70,6 @@ public class Student {
/**
* 学生性别 (0: 女生 1: 男生)。
*/
@ApiModelProperty(value = "学生性别 (0: 女生 1: 男生)", required = true)
@NotNull(message = "数据验证失败，学生性别不能为空！")
@ConstDictRef(constDictClass = Gender.class, message = "数据验证失败，学生性别为无效值！")
private Integer gender;
@@ -87,14 +77,12 @@ public class Student {
/**
* 生日。
*/
@ApiModelProperty(value = "生日", required = true)
@NotNull(message = "数据验证失败，出生日期不能为空！")
private Date birthday;
/**
* 经验等级 (0: 初级 1: 中级 2: 高级 3: 资深)。
*/
@ApiModelProperty(value = "经验等级 (0: 初级 1: 中级 2: 高级 3: 资深)", required = true)
@NotNull(message = "数据验证失败，经验等级不能为空！")
@ConstDictRef(constDictClass = ExpLevel.class, message = "数据验证失败，经验等级为无效值！")
@Column(name = "experience_level")
@@ -103,7 +91,6 @@ public class Student {
/**
* 总共充值学币数量。
*/
@ApiModelProperty(value = "总共充值学币数量", required = true)
@NotNull(message = "数据验证失败，充值学币不能为空！", groups = {UpdateGroup.class})
@Column(name = "total_coin")
private Integer totalCoin;
@@ -111,7 +98,6 @@ public class Student {
/**
* 可用学币数量。
*/
@ApiModelProperty(value = "可用学币数量", required = true)
@NotNull(message = "数据验证失败，剩余学币不能为空！", groups = {UpdateGroup.class})
@Column(name = "left_coin")
private Integer leftCoin;
@@ -119,7 +105,6 @@ public class Student {
/**
* 年级Id。
*/
@ApiModelProperty(value = "年级Id", required = true)
@NotNull(message = "数据验证失败，年级不能为空！")
@Column(name = "grade_id")
private Integer gradeId;
@@ -127,7 +112,6 @@ public class Student {
/**
* 校区Id。
*/
@ApiModelProperty(value = "校区Id", required = true)
@NotNull(message = "数据验证失败，所属校区不能为空！")
@Column(name = "school_id")
private Long schoolId;
@@ -135,14 +119,12 @@ public class Student {
/**
* 注册时间。
*/
@ApiModelProperty(value = "注册时间")
@Column(name = "register_time")
private Date registerTime;
/**
* 学生状态 (0: 正常 1: 锁定 2: 注销)。
*/
@ApiModelProperty(value = "学生状态 (0: 正常 1: 锁定 2: 注销)", required = true)
@NotNull(message = "数据验证失败，学生状态不能为空！", groups = {UpdateGroup.class})
@ConstDictRef(constDictClass = StudentStatus.class, message = "数据验证失败，学生状态为无效值！")
private Integer status;
@@ -150,39 +132,33 @@ public class Student {
/**
* birthday 范围过滤起始值(>=)。
*/
@ApiModelProperty(value = "birthday 范围过滤起始值(>=)")
@Transient
private String birthdayStart;
/**
* birthday 范围过滤结束值(<=)。
*/
@ApiModelProperty(value = "birthday 范围过滤结束值(<=)")
@Transient
private String birthdayEnd;
/**
* registerTime 范围过滤起始值(>=)。
*/
@ApiModelProperty(value = "registerTime 范围过滤起始值(>=)")
@Transient
private String registerTimeStart;
/**
* registerTime 范围过滤结束值(<=)。
*/
@ApiModelProperty(value = "registerTime 范围过滤结束值(<=)")
@Transient
private String registerTimeEnd;
/**
* login_mobile / student_name LIKE搜索字符串。
*/
@ApiModelProperty(value = "LIKE模糊搜索字符串")
@Transient
private String searchString;
@ApiModelProperty(hidden = true)
@RelationDict(
masterIdField = "provinceId",
slaveServiceName = "areaCodeService",
@@ -192,7 +168,6 @@ public class Student {
@Transient
private Map<String, Object> provinceIdDictMap;
@ApiModelProperty(hidden = true)
@RelationDict(
masterIdField = "cityId",
slaveServiceName = "areaCodeService",
@@ -202,7 +177,6 @@ public class Student {
@Transient
private Map<String, Object> cityIdDictMap;
@ApiModelProperty(hidden = true)
@RelationDict(
masterIdField = "districtId",
slaveServiceName = "areaCodeService",
@@ -212,7 +186,6 @@ public class Student {
@Transient
private Map<String, Object> districtIdDictMap;
@ApiModelProperty(hidden = true)
@RelationDict(
masterIdField = "gradeId",
slaveServiceName = "gradeService",
@@ -222,7 +195,6 @@ public class Student {
@Transient
private Map<String, Object> gradeIdDictMap;
@ApiModelProperty(hidden = true)
@RelationDict(
masterIdField = "schoolId",
slaveServiceName = "schoolInfoService",
@@ -232,21 +204,18 @@ public class Student {
@Transient
private Map<String, Object> schoolIdDictMap;
@ApiModelProperty(hidden = true)
@RelationConstDict(
masterIdField = "gender",
constantDictClass = Gender.class)
@Transient
private Map<String, Object> genderDictMap;
@ApiModelProperty(hidden = true)
@RelationConstDict(
masterIdField = "experienceLevel",
constantDictClass = ExpLevel.class)
@Transient
private Map<String, Object> experienceLevelDictMap;
@ApiModelProperty(hidden = true)
@RelationConstDict(
masterIdField = "status",
constantDictClass = StudentStatus.class)

29
orange-demo-single-service-for-app/application/src/main/java/com/orange/demo/app/model/StudentActionStats.java
View File

@@ -2,8 +2,6 @@ package com.orange.demo.app.model;
import com.orange.demo.common.core.annotation.RelationDict;
import com.orange.demo.common.core.validator.UpdateGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.persistence.*;
import javax.validation.constraints.*;
@@ -17,7 +15,6 @@ import java.util.Map;
* @author Jerry
* @date 2020-09-24
*/
@ApiModel("StudentActionStats实体对象")
@Data
@Table(name = "zz_student_action_stats")
public class StudentActionStats {
@@ -25,7 +22,6 @@ public class StudentActionStats {
/**
* 主键Id。
*/
@ApiModelProperty(value = "主键Id", required = true)
@NotNull(message = "数据验证失败，主键Id不能为空！", groups = {UpdateGroup.class})
@Id
@Column(name = "stats_id")
@@ -34,7 +30,6 @@ public class StudentActionStats {
/**
* 统计日期。
*/
@ApiModelProperty(value = "统计日期", required = true)
@NotNull(message = "数据验证失败，统计日期不能为空！")
@Column(name = "stats_date")
private Date statsDate;
@@ -42,14 +37,12 @@ public class StudentActionStats {
/**
* 统计小时。
*/
@ApiModelProperty(value = "统计小时")
@Column(name = "stats_month")
private Date statsMonth;
/**
* 年级Id。
*/
@ApiModelProperty(value = "年级Id", required = true)
@NotNull(message = "数据验证失败，所属年级不能为空！")
@Column(name = "grade_id")
private Integer gradeId;
@@ -57,7 +50,6 @@ public class StudentActionStats {
/**
* 学生所在省Id。
*/
@ApiModelProperty(value = "学生所在省Id", required = true)
@NotNull(message = "数据验证失败，所在省份不能为空！")
@Column(name = "province_id")
private Long provinceId;
@@ -65,7 +57,6 @@ public class StudentActionStats {
/**
* 学生所在城市Id。
*/
@ApiModelProperty(value = "学生所在城市Id", required = true)
@NotNull(message = "数据验证失败，所在城市不能为空！", groups = {UpdateGroup.class})
@Column(name = "city_id")
private Long cityId;
@@ -73,7 +64,6 @@ public class StudentActionStats {
/**
* 购课学币数量。
*/
@ApiModelProperty(value = "购课学币数量", required = true)
@NotNull(message = "数据验证失败，购课学币数量不能为空！", groups = {UpdateGroup.class})
@Column(name = "buy_course_amount")
private Integer buyCourseAmount;
@@ -81,7 +71,6 @@ public class StudentActionStats {
/**
* 购买课程次数。
*/
@ApiModelProperty(value = "购买课程次数", required = true)
@NotNull(message = "数据验证失败，购买课程次数不能为空！", groups = {UpdateGroup.class})
@Column(name = "buy_course_count")
private Integer buyCourseCount;
@@ -89,7 +78,6 @@ public class StudentActionStats {
/**
* 购买视频学币数量。
*/
@ApiModelProperty(value = "购买视频学币数量", required = true)
@NotNull(message = "数据验证失败，购买视频学币数量不能为空！", groups = {UpdateGroup.class})
@Column(name = "buy_video_amount")
private Integer buyVideoAmount;
@@ -97,7 +85,6 @@ public class StudentActionStats {
/**
* 购买视频次数。
*/
@ApiModelProperty(value = "购买视频次数", required = true)
@NotNull(message = "数据验证失败，购买视频次数不能为空！", groups = {UpdateGroup.class})
@Column(name = "buy_video_count")
private Integer buyVideoCount;
@@ -105,7 +92,6 @@ public class StudentActionStats {
/**
* 购买作业学币数量。
*/
@ApiModelProperty(value = "购买作业学币数量", required = true)
@NotNull(message = "数据验证失败，购买作业学币数量不能为空！", groups = {UpdateGroup.class})
@Column(name = "buy_paper_amount")
private Integer buyPaperAmount;
@@ -113,7 +99,6 @@ public class StudentActionStats {
/**
* 购买作业次数。
*/
@ApiModelProperty(value = "购买作业次数", required = true)
@NotNull(message = "数据验证失败，购买作业次数不能为空！", groups = {UpdateGroup.class})
@Column(name = "buy_paper_count")
private Integer buyPaperCount;
@@ -121,7 +106,6 @@ public class StudentActionStats {
/**
* 购买献花数量。
*/
@ApiModelProperty(value = "购买献花数量", required = true)
@NotNull(message = "数据验证失败，购买献花数量不能为空！", groups = {UpdateGroup.class})
@Column(name = "buy_flower_amount")
private Integer buyFlowerAmount;
@@ -129,7 +113,6 @@ public class StudentActionStats {
/**
* 购买献花次数。
*/
@ApiModelProperty(value = "购买献花次数", required = true)
@NotNull(message = "数据验证失败，购买献花次数不能为空！", groups = {UpdateGroup.class})
@Column(name = "buy_flower_count")
private Integer buyFlowerCount;
@@ -137,7 +120,6 @@ public class StudentActionStats {
/**
* 充值学币数量。
*/
@ApiModelProperty(value = "充值学币数量", required = true)
@NotNull(message = "数据验证失败，充值学币数量不能为空！", groups = {UpdateGroup.class})
@Column(name = "recharge_coin_amount")
private Integer rechargeCoinAmount;
@@ -145,7 +127,6 @@ public class StudentActionStats {
/**
* 充值学币次数。
*/
@ApiModelProperty(value = "充值学币次数", required = true)
@NotNull(message = "数据验证失败，充值学币次数不能为空！", groups = {UpdateGroup.class})
@Column(name = "recharge_coin_count")
private Integer rechargeCoinCount;
@@ -153,7 +134,6 @@ public class StudentActionStats {
/**
* 线下课程上课次数。
*/
@ApiModelProperty(value = "线下课程上课次数", required = true)
@NotNull(message = "数据验证失败，线下课程上课次数不能为空！")
@Column(name = "do_course_count")
private Integer doCourseCount;
@@ -161,7 +141,6 @@ public class StudentActionStats {
/**
* 观看视频次数。
*/
@ApiModelProperty(value = "观看视频次数", required = true)
@NotNull(message = "数据验证失败，观看视频次数不能为空！", groups = {UpdateGroup.class})
@Column(name = "watch_video_count")
private Integer watchVideoCount;
@@ -169,7 +148,6 @@ public class StudentActionStats {
/**
* 购买献花消费学币数量。
*/
@ApiModelProperty(value = "购买献花消费学币数量", required = true)
@NotNull(message = "数据验证失败，购买献花消费学币数量不能为空！")
@Column(name = "watch_video_total_second")
private Integer watchVideoTotalSecond;
@@ -177,7 +155,6 @@ public class StudentActionStats {
/**
* 做题数量。
*/
@ApiModelProperty(value = "做题数量", required = true)
@NotNull(message = "数据验证失败，做题数量不能为空！", groups = {UpdateGroup.class})
@Column(name = "do_exercise_count")
private Integer doExerciseCount;
@@ -185,7 +162,6 @@ public class StudentActionStats {
/**
* 做题正确的数量。
*/
@ApiModelProperty(value = "做题正确的数量", required = true)
@NotNull(message = "数据验证失败，做题正确的数量不能为空！", groups = {UpdateGroup.class})
@Column(name = "do_exercise_correct_count")
private Integer doExerciseCorrectCount;
@@ -193,18 +169,15 @@ public class StudentActionStats {
/**
* statsDate 范围过滤起始值(>=)。
*/
@ApiModelProperty(value = "statsDate 范围过滤起始值(>=)")
@Transient
private String statsDateStart;
/**
* statsDate 范围过滤结束值(<=)。
*/
@ApiModelProperty(value = "statsDate 范围过滤结束值(<=)")
@Transient
private String statsDateEnd;
@ApiModelProperty(hidden = true)
@RelationDict(
masterIdField = "gradeId",
slaveServiceName = "gradeService",
@@ -214,7 +187,6 @@ public class StudentActionStats {
@Transient
private Map<String, Object> gradeIdDictMap;
@ApiModelProperty(hidden = true)
@RelationDict(
masterIdField = "provinceId",
slaveServiceName = "areaCodeService",
@@ -224,7 +196,6 @@ public class StudentActionStats {
@Transient
private Map<String, Object> provinceIdDictMap;
@ApiModelProperty(hidden = true)
@RelationDict(
masterIdField = "cityId",
slaveServiceName = "areaCodeService",

24
orange-demo-single-service-for-app/application/src/main/java/com/orange/demo/app/model/StudentActionTrans.java
View File

@@ -6,8 +6,6 @@ import com.orange.demo.common.core.annotation.RelationDict;
import com.orange.demo.common.core.annotation.RelationConstDict;
import com.orange.demo.common.core.validator.UpdateGroup;
import com.orange.demo.common.core.validator.ConstDictRef;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.persistence.*;
import javax.validation.constraints.*;
@@ -21,7 +19,6 @@ import java.util.Map;
* @author Jerry
* @date 2020-09-24
*/
@ApiModel("StudentActionTrans实体对象")
@Data
@Table(name = "zz_student_action_trans")
public class StudentActionTrans {
@@ -29,7 +26,6 @@ public class StudentActionTrans {
/**
* 主键Id。
*/
@ApiModelProperty(value = "主键Id", required = true)
@NotNull(message = "数据验证失败，主键Id不能为空！", groups = {UpdateGroup.class})
@Id
@Column(name = "trans_id")
@@ -38,7 +34,6 @@ public class StudentActionTrans {
/**
* 学生Id。
*/
@ApiModelProperty(value = "学生Id", required = true)
@NotNull(message = "数据验证失败，学生Id不能为空！")
@Column(name = "student_id")
private Long studentId;
@@ -46,7 +41,6 @@ public class StudentActionTrans {
/**
* 学生名称。
*/
@ApiModelProperty(value = "学生名称", required = true)
@NotBlank(message = "数据验证失败，学生名称不能为空！")
@Column(name = "student_name")
private String studentName;
@@ -54,7 +48,6 @@ public class StudentActionTrans {
/**
* 学生校区。
*/
@ApiModelProperty(value = "学生校区", required = true)
@NotNull(message = "数据验证失败，学生校区不能为空！")
@Column(name = "school_id")
private Long schoolId;
@@ -62,7 +55,6 @@ public class StudentActionTrans {
/**
* 年级Id。
*/
@ApiModelProperty(value = "年级Id", required = true)
@NotNull(message = "数据验证失败，学生年级不能为空！")
@Column(name = "grade_id")
private Integer gradeId;
@@ -70,7 +62,6 @@ public class StudentActionTrans {
/**
* 行为类型(0: 充值 1: 购课 2: 上课签到 3: 上课签退 4: 看视频课 5: 做作业 6: 刷题 7: 献花)。
*/
@ApiModelProperty(value = "行为类型(0: 充值 1: 购课 2: 上课签到 3: 上课签退 4: 看视频课 5: 做作业 6: 刷题 7: 献花)", required = true)
@NotNull(message = "数据验证失败，行为类型不能为空！")
@ConstDictRef(constDictClass = StudentActionType.class, message = "数据验证失败，行为类型为无效值！")
@Column(name = "action_type")
@@ -79,7 +70,6 @@ public class StudentActionTrans {
/**
* 设备类型(0: iOS 1: Android 2: PC)。
*/
@ApiModelProperty(value = "设备类型(0: iOS 1: Android 2: PC)", required = true)
@NotNull(message = "数据验证失败，设备类型不能为空！")
@ConstDictRef(constDictClass = DeviceType.class, message = "数据验证失败，设备类型为无效值！")
@Column(name = "device_type")
@@ -88,56 +78,48 @@ public class StudentActionTrans {
/**
* 看视频秒数。
*/
@ApiModelProperty(value = "看视频秒数")
@Column(name = "watch_video_seconds")
private Integer watchVideoSeconds;
/**
* 购买献花数量。
*/
@ApiModelProperty(value = "购买献花数量")
@Column(name = "flower_count")
private Integer flowerCount;
/**
* 购买作业数量。
*/
@ApiModelProperty(value = "购买作业数量")
@Column(name = "paper_count")
private Integer paperCount;
/**
* 购买视频数量。
*/
@ApiModelProperty(value = "购买视频数量")
@Column(name = "video_count")
private Integer videoCount;
/**
* 购买课程数量。
*/
@ApiModelProperty(value = "购买课程数量")
@Column(name = "course_count")
private Integer courseCount;
/**
* 充值学币数量。
*/
@ApiModelProperty(value = "充值学币数量")
@Column(name = "coin_count")
private Integer coinCount;
/**
* 做题是否正确标记。
*/
@ApiModelProperty(value = "做题是否正确标记")
@Column(name = "exercise_correct_flag")
private Integer exerciseCorrectFlag;
/**
* 发生时间。
*/
@ApiModelProperty(value = "发生时间", required = true)
@NotNull(message = "数据验证失败，发生时间不能为空！")
@Column(name = "create_time")
private Date createTime;
@@ -145,18 +127,15 @@ public class StudentActionTrans {
/**
* createTime 范围过滤起始值(>=)。
*/
@ApiModelProperty(value = "createTime 范围过滤起始值(>=)")
@Transient
private String createTimeStart;
/**
* createTime 范围过滤结束值(<=)。
*/
@ApiModelProperty(value = "createTime 范围过滤结束值(<=)")
@Transient
private String createTimeEnd;
@ApiModelProperty(hidden = true)
@RelationDict(
masterIdField = "schoolId",
slaveServiceName = "schoolInfoService",
@@ -166,7 +145,6 @@ public class StudentActionTrans {
@Transient
private Map<String, Object> schoolIdDictMap;
@ApiModelProperty(hidden = true)
@RelationDict(
masterIdField = "gradeId",
slaveServiceName = "gradeService",
@@ -176,14 +154,12 @@ public class StudentActionTrans {
@Transient
private Map<String, Object> gradeIdDictMap;
@ApiModelProperty(hidden = true)
@RelationConstDict(
masterIdField = "actionType",
constantDictClass = StudentActionType.class)
@Transient
private Map<String, Object> actionTypeDictMap;
@ApiModelProperty(hidden = true)
@RelationConstDict(
masterIdField = "deviceType",
constantDictClass = DeviceType.class)

15
orange-demo-single-service-for-app/application/src/main/java/com/orange/demo/app/model/StudentClass.java
View File

@@ -7,8 +7,6 @@ import com.orange.demo.common.core.annotation.RelationConstDict;
import com.orange.demo.common.core.annotation.DeletedFlagColumn;
import com.orange.demo.common.core.validator.UpdateGroup;
import com.orange.demo.common.core.validator.ConstDictRef;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.persistence.*;
import javax.validation.constraints.*;
@@ -22,7 +20,6 @@ import java.util.Map;
* @author Jerry
* @date 2020-09-24
*/
@ApiModel("StudentClass实体对象")
@Data
@Table(name = "zz_class")
public class StudentClass {
@@ -30,7 +27,6 @@ public class StudentClass {
/**
* 班级Id。
*/
@ApiModelProperty(value = "班级Id", required = true)
@NotNull(message = "数据验证失败，班级Id不能为空！", groups = {UpdateGroup.class})
@Id
@Column(name = "class_id")
@@ -39,7 +35,6 @@ public class StudentClass {
/**
* 班级名称。
*/
@ApiModelProperty(value = "班级名称", required = true)
@NotBlank(message = "数据验证失败，班级名称不能为空！")
@Column(name = "class_name")
private String className;
@@ -47,7 +42,6 @@ public class StudentClass {
/**
* 学校Id。
*/
@ApiModelProperty(value = "学校Id", required = true)
@NotNull(message = "数据验证失败，所属校区不能为空！")
@Column(name = "school_id")
private Long schoolId;
@@ -55,7 +49,6 @@ public class StudentClass {
/**
* 学生班长Id。
*/
@ApiModelProperty(value = "学生班长Id", required = true)
@NotNull(message = "数据验证失败，学生班长不能为空！")
@Column(name = "leader_id")
private Long leaderId;
@@ -63,7 +56,6 @@ public class StudentClass {
/**
* 已完成课时数量。
*/
@ApiModelProperty(value = "已完成课时数量", required = true)
@NotNull(message = "数据验证失败，已完成课时不能为空！", groups = {UpdateGroup.class})
@Column(name = "finish_class_hour")
private Integer finishClassHour;
@@ -71,7 +63,6 @@ public class StudentClass {
/**
* 班级级别(0: 初级班 1: 培优班 2: 冲刺提分班 3: 竞赛班)。
*/
@ApiModelProperty(value = "班级级别(0: 初级班 1: 培优班 2: 冲刺提分班 3: 竞赛班)", required = true)
@NotNull(message = "数据验证失败，班级级别不能为空！")
@ConstDictRef(constDictClass = ClassLevel.class, message = "数据验证失败，班级级别为无效值！")
@Column(name = "class_level")
@@ -80,26 +71,22 @@ public class StudentClass {
/**
* 创建用户。
*/
@ApiModelProperty(value = "创建用户")
@Column(name = "create_user_id")
private Long createUserId;
/**
* 班级创建时间。
*/
@ApiModelProperty(value = "班级创建时间")
@Column(name = "create_time")
private Date createTime;
/**
* 逻辑删除标记字段(1: 正常 -1: 已删除)。
*/
@ApiModelProperty(hidden = true)
@JSONField(serialize = false)
@DeletedFlagColumn
private Integer status;
@ApiModelProperty(hidden = true)
@RelationDict(
masterIdField = "schoolId",
slaveServiceName = "schoolInfoService",
@@ -109,7 +96,6 @@ public class StudentClass {
@Transient
private Map<String, Object> schoolIdDictMap;
@ApiModelProperty(hidden = true)
@RelationDict(
masterIdField = "leaderId",
slaveServiceName = "studentService",
@@ -119,7 +105,6 @@ public class StudentClass {
@Transient
private Map<String, Object> leaderIdDictMap;
@ApiModelProperty(hidden = true)
@RelationConstDict(
masterIdField = "classLevel",
constantDictClass = ClassLevel.class)

27
orange-demo-single-service-for-app/application/src/main/java/com/orange/demo/upms/controller/LoginController.java
View File

@@ -1,10 +1,6 @@
package com.orange.demo.upms.controller;
import com.alibaba.fastjson.JSONObject;
import com.github.xiaoymin.knife4j.annotations.ApiSupport;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import lombok.extern.slf4j.Slf4j;
import com.orange.demo.config.ApplicationConfig;
import com.orange.demo.upms.service.*;
@@ -12,6 +8,7 @@ import com.orange.demo.upms.model.SysUser;
import com.orange.demo.upms.model.constant.SysUserStatus;
import com.orange.demo.upms.model.constant.SysUserType;
import com.orange.demo.common.core.annotation.NoAuthInterface;
import com.orange.demo.common.core.annotation.MyRequestBody;
import com.orange.demo.common.core.constant.ApplicationConstant;
import com.orange.demo.common.core.constant.ErrorCodeEnum;
import com.orange.demo.common.core.object.ResponseResult;
@@ -32,8 +29,6 @@ import java.util.*;
* @author Jerry
* @date 2020-09-24
*/
@ApiSupport(order = 1)
@Api(tags = "用户登录接口")
@Slf4j
@RestController
@RequestMapping("/admin/upms/login")
@@ -55,23 +50,17 @@ public class LoginController {
* @param password 密码。
* @return 应答结果对象，其中包括JWT的Token数据，以及菜单列表。
*/
@ApiImplicitParams({
// 这里包含密码密文，仅用于方便开发期间的接口测试，集成测试和发布阶段，需要将当前注解去掉。
// 如果您重新生成了公钥和私钥，请替换password的缺省值。
@ApiImplicitParam(name = "loginName", defaultValue = "admin"),
@ApiImplicitParam(name = "password", defaultValue = "IP3ccke3GhH45iGHB5qP9p7iZw6xUyj28Ju10rnBiPKOI35sc%2BjI7%2FdsjOkHWMfUwGYGfz8ik31HC2Ruk%2Fhkd9f6RPULTHj7VpFdNdde2P9M4mQQnFBAiPM7VT9iW3RyCtPlJexQ3nAiA09OqG%2F0sIf1kcyveSrulxembARDbDo%3D")
})
@NoAuthInterface
@GetMapping("/doLogin")
@PostMapping("/doLogin")
public ResponseResult<JSONObject> doLogin(
@RequestParam String loginName, @RequestParam String password) throws Exception {
@MyRequestBody String loginName, @MyRequestBody String password) throws Exception {
if (MyCommonUtil.existBlankArgument(loginName, password)) {
return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
}
SysUser user = sysUserService.getSysUserByLoginName(loginName);
password = URLDecoder.decode(password, StandardCharsets.UTF_8.name());
//NOTE: 第一次使用时，请务必阅读ApplicationConstant.PRIVATE_KEY的代码注释。
//执行RsaUtil工具类中的main函数，可以生成新的公钥和私钥。
// NOTE: 第一次使用时，请务必阅读ApplicationConstant.PRIVATE_KEY的代码注释。
// 执行RsaUtil工具类中的main函数，可以生成新的公钥和私钥。
password = RsaUtil.decrypt(password, ApplicationConstant.PRIVATE_KEY);
if (user == null || !passwordEncoder.matches(password, user.getPassword())) {
return ResponseResult.error(ErrorCodeEnum.INVALID_USERNAME_PASSWORD);
@@ -119,15 +108,15 @@ public class LoginController {
*/
@PostMapping("/changePassword")
public ResponseResult<Void> changePassword(
@RequestParam String oldPass, @RequestParam String newPass) throws Exception {
@MyRequestBody String oldPass, @MyRequestBody String newPass) throws Exception {
if (MyCommonUtil.existBlankArgument(oldPass, oldPass)) {
return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
}
TokenData tokenData = TokenData.takeFromRequest();
SysUser user = sysUserService.getById(tokenData.getUserId());
oldPass = URLDecoder.decode(oldPass, StandardCharsets.UTF_8.name());
//NOTE: 第一次使用时，请务必阅读ApplicationConstant.PRIVATE_KEY的代码注释。
//执行RsaUtil工具类中的main函数，可以生成新的公钥和私钥。
// NOTE: 第一次使用时，请务必阅读ApplicationConstant.PRIVATE_KEY的代码注释。
// 执行RsaUtil工具类中的main函数，可以生成新的公钥和私钥。
oldPass = RsaUtil.decrypt(oldPass, ApplicationConstant.PRIVATE_KEY);
if (user == null || !passwordEncoder.matches(oldPass, user.getPassword())) {
return ResponseResult.error(ErrorCodeEnum.INVALID_USERNAME_PASSWORD);

18
orange-demo-single-service-for-app/application/src/main/java/com/orange/demo/upms/controller/SysUserController.java
View File

@@ -10,8 +10,6 @@ import com.orange.demo.common.core.annotation.MyRequestBody;
import com.orange.demo.common.core.validator.AddGroup;
import com.orange.demo.common.core.validator.UpdateGroup;
import com.orange.demo.config.ApplicationConfig;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.beans.factory.annotation.Autowired;
@@ -26,7 +24,6 @@ import javax.validation.groups.Default;
* @author Jerry
* @date 2020-09-24
*/
@Api(tags = "用户管理管理接口")
@Slf4j
@RestController
@RequestMapping("/admin/upms/sysUser")
@@ -45,19 +42,15 @@ public class SysUserController {
* @param sysUser 新增用户对象。
* @return 应答结果对象，包含新增用户的主键Id。
*/
@ApiOperationSupport(ignoreParameters = {
"sysUser.userId",
"sysUser.createTimeStart",
"sysUser.createTimeEnd"})
@PostMapping("/add")
public ResponseResult<Long> add(@MyRequestBody SysUser sysUser) {
String errorMessage = MyCommonUtil.getModelValidationError(sysUser, Default.class, AddGroup.class);
if (errorMessage != null) {
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATAED_FAILED, errorMessage);
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
}
CallResult result = sysUserService.verifyRelatedData(sysUser, null);
if (!result.isSuccess()) {
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATAED_FAILED, result.getErrorMessage());
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, result.getErrorMessage());
}
sysUserService.saveNew(sysUser);
return ResponseResult.success(sysUser.getUserId());
@@ -69,14 +62,11 @@ public class SysUserController {
* @param sysUser 更新用户对象。
* @return 应答结果对象。
*/
@ApiOperationSupport(ignoreParameters = {
"sysUser.createTimeStart",
"sysUser.createTimeEnd"})
@PostMapping("/update")
public ResponseResult<Void> update(@MyRequestBody SysUser sysUser) {
String errorMessage = MyCommonUtil.getModelValidationError(sysUser, Default.class, UpdateGroup.class);
if (errorMessage != null) {
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATAED_FAILED, errorMessage);
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
}
SysUser originalUser = sysUserService.getById(sysUser.getUserId());
if (originalUser == null) {
@@ -84,7 +74,7 @@ public class SysUserController {
}
CallResult result = sysUserService.verifyRelatedData(sysUser, originalUser);
if (!result.isSuccess()) {
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATAED_FAILED, result.getErrorMessage());
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, result.getErrorMessage());
}
if (!sysUserService.update(sysUser, originalUser)) {
return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST);

19
orange-demo-single-service-for-app/application/src/main/java/com/orange/demo/upms/model/SysUser.java
View File

@@ -8,8 +8,6 @@ import com.orange.demo.common.core.annotation.DeletedFlagColumn;
import com.orange.demo.common.core.validator.AddGroup;
import com.orange.demo.common.core.validator.UpdateGroup;
import com.orange.demo.common.core.validator.ConstDictRef;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.persistence.*;
import javax.validation.constraints.*;
@@ -23,7 +21,6 @@ import java.util.Map;
* @author Jerry
* @date 2020-09-24
*/
@ApiModel("SysUser实体对象")
@Data
@Table(name = "zz_sys_user")
public class SysUser {
@@ -31,7 +28,6 @@ public class SysUser {
/**
* 用户Id。
*/
@ApiModelProperty(value = "用户Id", required = true)
@NotNull(message = "数据验证失败，用户Id不能为空！", groups = {UpdateGroup.class})
@Id
@Column(name = "user_id")
@@ -40,7 +36,6 @@ public class SysUser {
/**
* 登录用户名。
*/
@ApiModelProperty(value = "登录用户名", required = true)
@NotBlank(message = "数据验证失败，登录用户名不能为空！")
@Column(name = "login_name")
private String loginName;
@@ -48,14 +43,12 @@ public class SysUser {
/**
* 用户密码。
*/
@ApiModelProperty(value = "用户密码", required = true)
@NotBlank(message = "数据验证失败，用户密码不能为空！", groups = {AddGroup.class})
private String password;
/**
* 用户显示名称。
*/
@ApiModelProperty(value = "用户显示名称", required = true)
@NotBlank(message = "数据验证失败，用户显示名称不能为空！")
@Column(name = "show_name")
private String showName;
@@ -63,7 +56,6 @@ public class SysUser {
/**
* 用户类型(0: 管理员 1: 系统管理用户 2: 系统业务用户)。
*/
@ApiModelProperty(value = "用户类型(0: 管理员 1: 系统管理用户 2: 系统业务用户)", required = true)
@NotNull(message = "数据验证失败，用户类型(0: 管理员 1: 系统管理用户 2: 系统业务用户)不能为空！")
@ConstDictRef(constDictClass = SysUserType.class, message = "数据验证失败，用户类型(0: 管理员 1: 系统管理用户 2: 系统业务用户)为无效值！")
@Column(name = "user_type")
@@ -72,14 +64,12 @@ public class SysUser {
/**
* 用户头像的Url。
*/
@ApiModelProperty(value = "用户头像的Url")
@Column(name = "head_image_url")
private String headImageUrl;
/**
* 用户状态(0: 正常 1: 锁定)。
*/
@ApiModelProperty(value = "用户状态(0: 正常 1: 锁定)", required = true)
@NotNull(message = "数据验证失败，用户状态(0: 正常 1: 锁定)不能为空！")
@ConstDictRef(constDictClass = SysUserStatus.class, message = "数据验证失败，用户状态(0: 正常 1: 锁定)为无效值！")
@Column(name = "user_status")
@@ -88,7 +78,6 @@ public class SysUser {
/**
* 逻辑删除标记字段(1: 正常 -1: 已删除)。
*/
@ApiModelProperty(hidden = true)
@JSONField(serialize = false)
@DeletedFlagColumn
@Column(name = "deleted_flag")
@@ -97,53 +86,45 @@ public class SysUser {
/**
* 创建用户Id。
*/
@ApiModelProperty(value = "创建用户Id")
@Column(name = "create_user_id")
private Long createUserId;
/**
* 创建用户名。
*/
@ApiModelProperty(value = "创建用户名")
@Column(name = "create_username")
private String createUsername;
/**
* 创建时间。
*/
@ApiModelProperty(value = "创建时间")
@Column(name = "create_time")
private Date createTime;
/**
* 更新时间。
*/
@ApiModelProperty(value = "更新时间")
@Column(name = "update_time")
private Date updateTime;
/**
* createTime 范围过滤起始值(>=)。
*/
@ApiModelProperty(value = "createTime 范围过滤起始值(>=)")
@Transient
private String createTimeStart;
/**
* createTime 范围过滤结束值(<=)。
*/
@ApiModelProperty(value = "createTime 范围过滤结束值(<=)")
@Transient
private String createTimeEnd;
@ApiModelProperty(hidden = true)
@RelationConstDict(
masterIdField = "userType",
constantDictClass = SysUserType.class)
@Transient
private Map<String, Object> userTypeDictMap;
@ApiModelProperty(hidden = true)
@RelationConstDict(
masterIdField = "userStatus",
constantDictClass = SysUserStatus.class)

11
orange-demo-single-service-for-app/application/src/main/resources/application.yml
View File

@@ -56,15 +56,6 @@ pagehelper:
supportMethodsArguments: false
params: count=countSql
swagger:
# 当enabled为false的时候，则可禁用swagger。
enabled: true
# 工程的基础包名。
basePackage: com.orange.demo
title: 橙单单体开源版
description: 橙单单体开源版详情
version: 1.0
# 暴露监控端点
management:
endpoints:
@@ -199,4 +190,4 @@ application:
sequence:
# Snowflake 分布式Id生成算法所需的WorkNode参数值。
snowflakeWorkNode: 1
snowflakeWorkNode: 1

3
orange-demo-single-service-for-app/application/src/main/resources/log4j2.xml
View File

@@ -53,9 +53,6 @@
<root level="${OUTPUT_LOG_LEVEL}">
<AppenderRef ref="console"/>
</root>
<Logger name="springfox.documentation" additivity="false" level="error">
<AppenderRef ref="console"/>
</Logger>
<Logger name="com.orange.demo" additivity="false" level="info">
<AppenderRef ref="console"/>
<AppenderRef ref="file_log"/>