Merge branch 'dev_v2.2.0' of http://git.qmth.com.cn/wangliang/distributed-print-service into dev_v2.2.0

distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/service/impl/TaskLogicServiceImpl.java

@@ -1350,28 +1350,30 @@ public class TaskLogicServiceImpl implements TaskLogicService {
                     SysOrg teachingRoomOrg = this.validSysOrgExists(teachingRoomMap, statisticsImportDto.getTeachingRoomName(), sysUser.getSchoolId(), OrgTypeEnum.TEACHING_ROOM, excelErrorTemp, (y + 1), (i + 1), "开课部门");
                     BasicCourse basicCourse = this.validBasicCourseExists(courseMap, statisticsImportDto.getCourseName(), sysUser.getSchoolId(), statisticsImportDto.getCourseCode(), excelErrorTemp, (y + 1), (i + 1), "课程代码");
                     String teacherName = statisticsImportDto.getTeacherName();
-                    if (teacherName.indexOf(",") == -1) {
-                        SysUser dbUser = this.validSysUserExists(userMap, teacherName, sysUser.getSchoolId(), excelErrorTemp, (y + 1), (i + 1), "任课老师");
-                    } else {
-                        String[] teacherNames = teacherName.split(",");
-                        for (int k = 0; k < teacherNames.length; k++) {
-                            SysUser dbUser = this.validSysUserExists(userMap, teacherNames[k], sysUser.getSchoolId(), excelErrorTemp, (y + 1), (i + 1), "任课老师" + teacherNames[k]);
-                        }
-                    }
+//                    if (teacherName.indexOf(",") == -1) {
+//                        SysUser dbUser = this.validSysUserExists(userMap, teacherName, sysUser.getSchoolId(), excelErrorTemp, (y + 1), (i + 1), "任课老师");
+//                    } else {
+//                        String[] teacherNames = teacherName.split(",");
+//                        for (int k = 0; k < teacherNames.length; k++) {
+//                            SysUser dbUser = this.validSysUserExists(userMap, teacherNames[k], sysUser.getSchoolId(), excelErrorTemp, (y + 1), (i + 1), "任课老师" + teacherNames[k]);
+//                        }
+//                    }
                     BasicClazz basicClazz = this.validBasicClazzExists(clazzMap, statisticsImportDto.getClazzName(), sysUser.getSchoolId(), excelErrorTemp, (y + 1), (i + 1), "班级名称");
 
-                    TCStatistics tcStatistics = new TCStatistics(collegeOrg.getId(),
-                            collegeOrg.getName(),
-                            teachingRoomOrg.getId(),
-                            teachingRoomOrg.getName(),
-                            basicCourse.getName(),
-                            basicCourse.getCode(),
-                            teacherName,
-                            basicClazz.getId(),
-                            basicClazz.getClazzName(),
-                            batchNo,
-                            sysUser.getId());
-                    tcStatisticsList.add(tcStatistics);
+                    if (excelErrorTemp.size() == 0) {
+                        TCStatistics tcStatistics = new TCStatistics(collegeOrg.getId(),
+                                collegeOrg.getName(),
+                                teachingRoomOrg.getId(),
+                                teachingRoomOrg.getName(),
+                                basicCourse.getName(),
+                                basicCourse.getCode(),
+                                teacherName,
+                                basicClazz.getId(),
+                                basicClazz.getClazzName(),
+                                batchNo,
+                                sysUser.getId());
+                        tcStatisticsList.add(tcStatistics);
+                    }
                 }
             }
             if (excelErrorTemp.size() > 0) {

distributed-print-business/src/main/resources/mapper/ExamPrintPlanMapper.xml

@@ -61,10 +61,10 @@
                 LEFT JOIN
             sys_user b on a.create_id = b.id
         <where>
-            <if test="schoolId != null and schoolId > 0">
+            <if test="schoolId != null and schoolId != ''">
                 and a.school_id = #{schoolId}
             </if>
-            <if test="printPlanIdList.size() > 0">
+            <if test="printPlanIdList != null and printPlanIdList.size() > 0">
                 and a.id IN
                 <foreach collection="printPlanIdList" item="item" index="index" open="(" separator="," close=")">
                     #{item}
@@ -73,10 +73,10 @@
             <if test="status != null">
                 and a.status = #{status}
             </if>
-            <if test="startTime != null and startTime > 0">
+            <if test="startTime != null and startTime != ''">
                 and a.create_time >= #{startTime}
             </if>
-            <if test="endTime != null and endTime > 0">
+            <if test="endTime != null and endTime != ''">
                 and #{endTime} >= a.create_time
             </if>
             <if test="orgIds != null">
@@ -125,16 +125,16 @@
             <foreach collection="status" item="item" index="index" open="(" separator="," close=")">
                 #{item}
             </foreach>
-            <if test="schoolId != null and schoolId > 0">
+            <if test="schoolId != null and schoolId != ''">
                 and a.school_id = #{schoolId}
             </if>
             <if test="printPlanId!= null and printPlanId != ''">
                 and a.id = #{printPlanId}
             </if>
-            <if test="startTime != null and startTime > 0">
+            <if test="startTime != null and startTime != ''">
                 and a.create_time >= #{startTime}
             </if>
-            <if test="endTime != null and endTime > 0">
+            <if test="endTime != null and endTime != ''">
                 and #{endTime} >= a.create_time
             </if>
             <if test="orgIds != null">

distributed-print-business/src/main/resources/mapper/ExamTaskMapper.xml

@@ -290,10 +290,10 @@
             <if test="endTime != null and endTime != ''">
                 and a.start_time &lt;= #{endTime}
             </if>
-            <if test="startCreateTime != null and startCreateTime > 0">
+            <if test="startCreateTime != null and startCreateTime != ''">
                 and a.create_time >= #{startCreateTime}
             </if>
-            <if test="endCreateTime != null and endCreateTime > 0">
+            <if test="endCreateTime != null and endCreateTime != ''">
                 and #{endCreateTime} >= a.create_time
             </if>
             <if test="createName != null and createName != ''">
@@ -377,10 +377,10 @@
             <if test="endTime != null and endTime != ''">
                 and a.start_time &lt;= #{endTime}
             </if>
-            <if test="startCreateTime != null and startCreateTime > 0">
+            <if test="startCreateTime != null and startCreateTime != ''">
                 and a.create_time >= #{startCreateTime}
             </if>
-            <if test="endCreateTime != null and endCreateTime > 0">
+            <if test="endCreateTime != null and endCreateTime != ''">
                 and #{endCreateTime} >= a.create_time
             </if>
             <if test="createName != null and createName != ''">

distributed-print/src/main/java/com/qmth/distributed/print/api/BasicCardRuleController.java

@@ -8,13 +8,17 @@ import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.distributed.print.business.bean.dto.CardRuleDto;
 import com.qmth.distributed.print.business.entity.BasicCardRule;
 import com.qmth.distributed.print.business.service.BasicCardRuleService;
+import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
 import java.util.List;
 
 /**
@@ -28,6 +32,7 @@ import java.util.List;
 @Api(tags = "题卡规则Controller")
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.basic}/card_rule")
+@Validated
 public class BasicCardRuleController {
 
     @Autowired
@@ -50,8 +55,8 @@ public class BasicCardRuleController {
                        @RequestParam(value = "name", required = false) String name,
                        @RequestParam(value = "createStartTime", required = false) Long createStartTime,
                        @RequestParam(value = "createEndTime", required = false) Long createEndTime,
-                       @RequestParam("pageNumber") Integer pageNumber,
-                       @RequestParam("pageSize") Integer pageSize) {
+                       @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
+                       @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
         IPage<CardRuleDto> cardRuleDtoIPage = basicCardRuleService.list(enable, name, createStartTime, createEndTime, pageNumber, pageSize);
         return ResultUtil.ok(cardRuleDtoIPage);
     }

distributed-print/src/main/java/com/qmth/distributed/print/api/BasicClazzController.java

@@ -1,7 +1,5 @@
 package com.qmth.distributed.print.api;
 
-import com.qmth.boot.api.annotation.Aac;
-import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.distributed.print.business.bean.result.EditResult;
 import com.qmth.distributed.print.business.service.PrintCommonService;
@@ -17,11 +15,14 @@ import com.qmth.teachcloud.common.util.ResultUtil;
 import com.qmth.teachcloud.common.util.ServletUtil;
 import io.swagger.annotations.*;
 import org.springframework.validation.BindingResult;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -34,6 +35,7 @@ import java.util.Objects;
 @Api(tags = "班级管理controller")
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.basic}/clazz")
+@Validated
 //@Aac(strict = BOOL.FALSE, auth = BOOL.FALSE)
 public class BasicClazzController {
     @Resource
@@ -47,8 +49,8 @@ public class BasicClazzController {
     @RequestMapping(value = "/query", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = Result.class)})
     public Result findBasicClazzList(@ApiParam(value = "查询参数（班级号或班级名）") @RequestParam(required = false) String queryParams,
-                                      @ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber,
-                                      @ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
+                                     @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
+                                     @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
         return ResultUtil.ok(basicClazzService.basicClazzPage(queryParams, pageNumber, pageSize));
     }
 
@@ -60,13 +62,13 @@ public class BasicClazzController {
             return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
         }
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-        return ResultUtil.ok(basicClazzService.saveBasicClazz(basicClazzParams,sysUser));
+        return ResultUtil.ok(basicClazzService.saveBasicClazz(basicClazzParams, sysUser));
     }
 
     @ApiOperation(value = "班级基本信息管理-批量删除（逻辑）")
     @RequestMapping(value = "/delete_batch", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "删除成功", response = EditResult.class)})
-    public Result deleteBasicClazz(@ApiParam(value = "选择的要删除的班级id集合",required = true) @RequestParam List<Long> idList) {
+    public Result deleteBasicClazz(@ApiParam(value = "选择的要删除的班级id集合", required = true) @RequestParam List<Long> idList) {
         return ResultUtil.ok(basicClazzService.removeBasicClazzBatch(idList));
     }
 
@@ -76,7 +78,7 @@ public class BasicClazzController {
     public Result basicClazzImportAsync(@ApiParam(value = "上传文件", required = true) @RequestParam MultipartFile file) throws Exception {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         Map<String, Object> map = printCommonService.saveTask(file, TaskTypeEnum.CLAZZ_IMPORT);
-        map.put(SystemConstant.SYS_USER,sysUser);
+        map.put(SystemConstant.SYS_USER, sysUser);
 
         asyncBasicClazzImportService.importTask(map);
         TBTask tbTask = Objects.nonNull(map.get(SystemConstant.TASK)) ? (TBTask) map.get(SystemConstant.TASK) : null;

distributed-print/src/main/java/com/qmth/distributed/print/api/BasicCourseController.java

@@ -1,8 +1,5 @@
 package com.qmth.distributed.print.api;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.qmth.boot.api.annotation.Aac;
-import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.distributed.print.business.bean.result.EditResult;
 import com.qmth.distributed.print.business.service.PrintCommonService;
@@ -19,11 +16,14 @@ import com.qmth.teachcloud.common.util.ResultUtil;
 import com.qmth.teachcloud.common.util.ServletUtil;
 import io.swagger.annotations.*;
 import org.springframework.validation.BindingResult;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -41,6 +41,7 @@ import java.util.stream.Collectors;
 @Api(tags = "课程Controller")
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.basic}/course")
+@Validated
 //@Aac(strict = BOOL.FALSE, auth = BOOL.FALSE)
 public class BasicCourseController {
 
@@ -51,25 +52,6 @@ public class BasicCourseController {
     @Resource
     private AsyncCourseDataImportService asyncCourseDataImportService;
 
-//    /**
-//     * 查询
-//     *
-//     * @param code
-//     * @param name
-//     * @param pageNumber
-//     * @param pageSize
-//     * @return
-//     */
-//    @ApiOperation(value = "查询")
-//    @RequestMapping(value = "/list", method = RequestMethod.POST)
-//    public Result list(@RequestParam(value = "code", required = false) String code,
-//                       @RequestParam(value = "name", required = false) String name,
-//                       @RequestParam Integer pageNumber,
-//                       @RequestParam Integer pageSize) {
-//        IPage<BasicCourse> userDtos = printCommonService.list(code, name, pageNumber, pageSize);
-//        return ResultUtil.ok(userDtos);
-//    }
-
     /**
      * 模糊查询
      *
@@ -88,22 +70,6 @@ public class BasicCourseController {
         List<BasicCourse> userDtos = printCommonService.list(param, printPlanIdList, teachingRoomId);
         return ResultUtil.ok(userDtos);
     }
-//
-//    /**
-//     * 新增/修改
-//     *
-//     * @param course
-//     * @return
-//     */
-//    @ApiOperation(value = "新增/修改")
-//    @RequestMapping(value = "/save", method = RequestMethod.POST)
-//    public Result save(@RequestBody BasicCourse course) {
-//        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-//        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
-//        course.setSchoolId(schoolId);
-//        boolean isSuccess = printCommonService.saveCourse(course, sysUser.getId());
-//        return ResultUtil.ok(isSuccess);
-//    }
 
     /**
      * 删除
@@ -126,8 +92,8 @@ public class BasicCourseController {
                                       @ApiParam(value = "创建时间（起始位置）") @RequestParam(required = false) String startCreateTime,
                                       @ApiParam(value = "创建时间（终止位置）") @RequestParam(required = false) String endCreateTime,
                                       @ApiParam(value = "状态") @RequestParam(required = false) Boolean enable,
-                                      @ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber,
-                                      @ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
+                                      @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
+                                      @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
         return ResultUtil.ok(basicCourseService.basicCoursePage(courseName, SystemConstant.convertIdToLong(startCreateTime), SystemConstant.convertIdToLong(endCreateTime), enable, pageNumber, pageSize));
     }
 

distributed-print/src/main/java/com/qmth/distributed/print/api/BasicStudentController.java

@@ -16,11 +16,14 @@ import com.qmth.teachcloud.common.util.ResultUtil;
 import com.qmth.teachcloud.common.util.ServletUtil;
 import io.swagger.annotations.*;
 import org.springframework.validation.BindingResult;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
 import java.util.*;
 
 /**
@@ -34,6 +37,7 @@ import java.util.*;
 @Api(tags = "学生管理controller")
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.basic}/student")
+@Validated
 //@Aac(strict = BOOL.FALSE, auth = BOOL.FALSE)
 public class BasicStudentController {
     @Resource
@@ -49,8 +53,8 @@ public class BasicStudentController {
     public Result findBasicStudentList(@ApiParam(value = "查询参数（学生学号或姓名）") @RequestParam(required = false) String queryParams,
                                        @ApiParam(value = "校区主键") @RequestParam(required = false) String campusId,
                                        @ApiParam(value = "班级主键") @RequestParam(required = false) String clazzId,
-                                      @ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber,
-                                      @ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
+                                      @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
+                                      @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
         Set<Long> clazzIdSet = new HashSet<>();
         if (SystemConstant.strNotNull(clazzId)){
             clazzIdSet.add(SystemConstant.convertIdToLong(clazzId));

distributed-print/src/main/java/com/qmth/distributed/print/api/BasicTemplateController.java

@@ -2,19 +2,22 @@ package com.qmth.distributed.print.api;
 
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.qmth.boot.api.annotation.Aac;
-import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.distributed.print.business.bean.dto.TemplateDto;
 import com.qmth.distributed.print.business.entity.BasicTemplate;
 import com.qmth.distributed.print.business.service.BasicTemplateService;
+import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+
 /**
  * <p>
  * 通用模板 前端控制器
@@ -26,6 +29,7 @@ import org.springframework.web.bind.annotation.*;
 @Api(tags = "通用模板Controller")
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.basic}/template")
+@Validated
 public class BasicTemplateController {
 
     @Autowired
@@ -45,13 +49,13 @@ public class BasicTemplateController {
      */
     @ApiOperation(value = "查询")
     @RequestMapping(value = "/list", method = RequestMethod.POST)
-    public Result list(@RequestParam(value = "enable",required = false) Boolean enable,
+    public Result list(@RequestParam(value = "enable", required = false) Boolean enable,
                        @RequestParam(value = "type", required = false) String type,
                        @RequestParam(value = "name", required = false) String name,
                        @RequestParam(value = "startTime", required = false) Long startTime,
                        @RequestParam(value = "endTime", required = false) Long endTime,
-                       @RequestParam Integer pageNumber,
-                       @RequestParam Integer pageSize) {
+                       @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
+                       @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
         IPage<TemplateDto> templateDtoIPage = basicTemplateService.list(enable, type, name, startTime, endTime, pageNumber, pageSize);
         return ResultUtil.ok(templateDtoIPage);
     }
@@ -59,12 +63,13 @@ public class BasicTemplateController {
 
     /**
      * 根据ID查询单个信息
+     *
      * @param id
      * @return
      */
     @ApiOperation(value = "根据ID查询单个信息")
     @RequestMapping(value = "/get_one", method = RequestMethod.POST)
-    public Result getOne(@RequestParam("id") Long id){
+    public Result getOne(@RequestParam("id") Long id) {
         BasicTemplate basicTemplate = basicTemplateService.getOne(id);
         return ResultUtil.ok(basicTemplate);
     }

distributed-print/src/main/java/com/qmth/distributed/print/api/ClientController.java

@@ -8,7 +8,6 @@ import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.distributed.print.business.bean.dto.*;
 import com.qmth.distributed.print.business.bean.params.ClientLoginParam;
 import com.qmth.distributed.print.business.service.ClientService;
-import com.qmth.teachcloud.common.bean.auth.AuthBean;
 import com.qmth.teachcloud.common.bean.result.LoginResult;
 import com.qmth.teachcloud.common.entity.BasicSchool;
 import com.qmth.teachcloud.common.entity.SysUser;
@@ -31,8 +30,6 @@ import java.security.NoSuchAlgorithmException;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.Set;
-import java.util.stream.Collectors;
 
 /**
  * @Date: 2021/4/19.
@@ -40,6 +37,7 @@ import java.util.stream.Collectors;
 @Api(tags = "客户端Controller")
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.client}")
+//@Validated
 public class ClientController {
 
     @Autowired
@@ -110,8 +108,8 @@ public class ClientController {
                                @RequestParam(value = "paperNumber", required = false) String paperNumber,
                                @RequestParam(value = "isTry", required = false) Boolean isTry,
                                @RequestParam(value = "isPass", required = false) Boolean isPass,
-                               @RequestParam("pageNumber") Integer pageNumber,
-                               @RequestParam("pageSize") Integer pageSize) {
+                               @RequestParam Integer pageNumber,
+                               @RequestParam Integer pageSize) {
         IPage<ClientExamTaskDto> examTasks = clientService.listTryTask(machineCode, orgId, printPlanId, courseCode, paperNumber, isTry, isPass, pageNumber, pageSize);
         return ResultUtil.ok(examTasks);
     }
@@ -209,8 +207,8 @@ public class ClientController {
                                 @RequestParam(value = "examEndTime", required = false) Long examEndTime,
                                 @RequestParam(value = "isDownload", required = false) Boolean isDownload,
                                 @RequestParam(value = "validate", required = false) Boolean validate,
-                                @RequestParam("pageNumber") Integer pageNumber,
-                                @RequestParam("pageSize") Integer pageSize) {
+                                @RequestParam Integer pageNumber,
+                                @RequestParam Integer pageSize) {
         IPage<ClientPrintTaskDto> printTaskDtoIPage = clientService.listClientPrintTask(machineCode, orgId, printPlanId, status, courseCode, paperNumber, examPlace, examRoom, examStartTime, examEndTime, isDownload, validate, pageNumber, pageSize);
         return ResultUtil.ok(printTaskDtoIPage);
     }
@@ -409,8 +407,8 @@ public class ClientController {
                               @RequestParam(value = "ticketNumber", required = false) String ticketNumber,
                               @RequestParam(value = "studentName", required = false) String studentName,
                               @RequestParam(value = "courseCode", required = false) String courseCode,
-                              @RequestParam("pageNumber") Integer pageNumber,
-                              @RequestParam("pageSize") Integer pageSize) {
+                              @RequestParam Integer pageNumber,
+                              @RequestParam Integer pageSize) {
         IPage<ClientExamStudentDto> examStudentDtoIPage = clientService.listStudent(examDetailId, ticketNumber, studentName, courseCode, pageNumber, pageSize);
         return ResultUtil.ok(examStudentDtoIPage);
     }
@@ -455,8 +453,8 @@ public class ClientController {
                                       @RequestParam(value = "examEndTime", required = false) Long examEndTime,
                                       @RequestParam(value = "courseCode", required = false) String courseCode,
                                       @RequestParam(value = "paperNumber", required = false) String paperNumber,
-                                      @RequestParam("pageNumber") Integer pageNumber,
-                                      @RequestParam("pageSize") Integer pageSize) {
+                                      @RequestParam Integer pageNumber,
+                                      @RequestParam Integer pageSize) {
         IPage<ClientPrintStatisticsDto> statisticsDtoIPage = clientService.listClientPrintStatistics(orgId, printPlanId, examPlace, examStartTime, examEndTime, courseCode, paperNumber, pageNumber, pageSize);
         return ResultUtil.ok(statisticsDtoIPage);
     }

distributed-print/src/main/java/com/qmth/distributed/print/api/ExamCardController.java

@@ -9,14 +9,18 @@ import com.qmth.distributed.print.business.bean.params.ExamCardParams;
 import com.qmth.distributed.print.business.entity.ExamCard;
 import com.qmth.distributed.print.business.service.ExamCardService;
 import com.qmth.teachcloud.common.bean.params.ArraysParams;
+import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
 import java.util.List;
 
 /**
@@ -30,6 +34,7 @@ import java.util.List;
 @Api(tags = "题卡Controller")
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.exam}/card")
+@Validated
 public class ExamCardController {
 
     @Autowired
@@ -86,8 +91,8 @@ public class ExamCardController {
                        @RequestParam(value = "applyEndTime", required = false) Long applyEndTime,
                        @RequestParam(value = "finishStartTime", required = false) Long finishStartTime,
                        @RequestParam(value = "finishEndTime", required = false) Long finishEndTime,
-                       @RequestParam(value = "pageNumber") Integer pageNumber,
-                       @RequestParam(value = "pageSize") Integer pageSize) {
+                       @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
+                       @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
         IPage<CardCustDto> cardCustDtoIPage = examCardService.listCardCust(schoolId, status, paperNumber, userId, applyStartTime, applyEndTime, finishStartTime, finishEndTime, pageNumber, pageSize);
         return ResultUtil.ok(cardCustDtoIPage);
     }

distributed-print/src/main/java/com/qmth/distributed/print/api/ExamDetailController.java

@@ -16,6 +16,7 @@ import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
 import com.qmth.teachcloud.common.util.ServletUtil;
 import io.swagger.annotations.*;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -23,6 +24,8 @@ import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
 import java.io.IOException;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -38,6 +41,7 @@ import java.util.stream.Collectors;
 @Api(tags = "考务数据管理Controller")
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.exam}/print")
+@Validated
 public class ExamDetailController {
     @Resource
     private TBTaskService tbTaskService;
@@ -77,17 +81,16 @@ public class ExamDetailController {
                                        @ApiParam(value = "卷袋号") @RequestParam(required = false) String packageCode,
                                        @ApiParam(value = "考试日期-起始") @RequestParam(required = false) Long startDate,
                                        @ApiParam(value = "考试日期-终止") @RequestParam(required = false) Long endDate,
-                                       @ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber,
-                                       @ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
-
+                                       @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
+                                       @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
-        if (Objects.isNull(printPlanIdList)){
+        if (Objects.isNull(printPlanIdList)) {
             printPlanIdList = new ArrayList<>();
         }
         List<Long> idList = printPlanIdList.stream().map(SystemConstant::convertIdToLong).collect(Collectors.toList());
         Set<Long> orgIds = teachcloudCommonService.listSubOrgIds(null);
         return ResultUtil.ok(examDetailService.findExaminationBriefPage(schoolId,
-                idList, courseCode, paperNumber, examPlace, examRoom, packageCode,startDate,endDate, pageNumber, pageSize, orgIds));
+                idList, courseCode, paperNumber, examPlace, examRoom, packageCode, startDate, endDate, pageNumber, pageSize, orgIds));
     }
 
     @ApiOperation(value = "考务数据导入-汇总数据查询")
@@ -103,12 +106,12 @@ public class ExamDetailController {
                                      @ApiParam(value = "考试日期-终止") @RequestParam(required = false) Long endDate) {
 
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
-        if (Objects.isNull(printPlanIdList)){
+        if (Objects.isNull(printPlanIdList)) {
             printPlanIdList = new ArrayList<>();
         }
         List<Long> idList = printPlanIdList.stream().map(SystemConstant::convertIdToLong).collect(Collectors.toList());
         Set<Long> orgIds = teachcloudCommonService.listSubOrgIds(null);
-        return ResultUtil.ok(examDetailService.findSummarizedData(schoolId, idList, courseCode, paperNumber, examPlace, examRoom, packageCode,startDate,endDate, orgIds));
+        return ResultUtil.ok(examDetailService.findSummarizedData(schoolId, idList, courseCode, paperNumber, examPlace, examRoom, packageCode, startDate, endDate, orgIds));
     }
 
     @ApiOperation(value = "考务数据导入-查看明细")
@@ -122,16 +125,16 @@ public class ExamDetailController {
                                         @ApiParam(value = "学生查询参数") @RequestParam(required = false) String studentParams,
                                         @ApiParam(value = "考试日期-起始") @RequestParam(required = false) Long startDate,
                                         @ApiParam(value = "考试日期-终止") @RequestParam(required = false) Long endDate,
-                                        @ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber,
-                                        @ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
+                                        @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
+                                        @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
 
-        if (Objects.isNull(printPlanIdList)){
+        if (Objects.isNull(printPlanIdList)) {
             printPlanIdList = new ArrayList<>();
         }
         List<Long> idList = printPlanIdList.stream().map(SystemConstant::convertIdToLong).collect(Collectors.toList());
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         return ResultUtil.ok(examDetailService.findExaminationDetail(schoolId, idList,
-                courseCode, paperNumber, examPlace, examRoom, studentParams,startDate,endDate, pageNumber, pageSize));
+                courseCode, paperNumber, examPlace, examRoom, studentParams, startDate, endDate, pageNumber, pageSize));
     }
 
     @ApiOperation(value = "查看考生明细")
@@ -147,8 +150,8 @@ public class ExamDetailController {
     @RequestMapping(value = "/data_detail_list", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = Result.class)})
     public Result findExaminationDetailById(@ApiParam(value = "考务场次id", required = true) @RequestParam String examDetailId,
-                                            @ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber,
-                                            @ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
+                                            @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
+                                            @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
 
         return ResultUtil.ok(examDetailService.findExaminationDetail(SystemConstant.convertIdToLong(examDetailId), pageNumber, pageSize));
     }
@@ -158,7 +161,7 @@ public class ExamDetailController {
     @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = Result.class)})
     public Result findExamPlaceDatasource(@RequestParam(value = "param", required = false) String param,
                                           @RequestParam(value = "printPlanId", required = false) List<String> printPlanId) {
-        if (Objects.isNull(printPlanId)){
+        if (Objects.isNull(printPlanId)) {
             printPlanId = new ArrayList<>();
         }
         List<Long> printPlanIdList = printPlanId.stream().map(SystemConstant::convertIdToLong).collect(Collectors.toList());
@@ -170,7 +173,7 @@ public class ExamDetailController {
     @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = Result.class)})
     public Result findExamRoomDatasource(@RequestParam(value = "param", required = false) String param,
                                          @RequestParam(value = "printPlanId", required = false) List<String> printPlanId) {
-        if (Objects.isNull(printPlanId)){
+        if (Objects.isNull(printPlanId)) {
             printPlanId = new ArrayList<>();
         }
         List<Long> printPlanIdList = printPlanId.stream().map(SystemConstant::convertIdToLong).collect(Collectors.toList());
@@ -197,12 +200,12 @@ public class ExamDetailController {
                              @ApiParam(value = "考试日期-起始") @RequestParam(required = false) Long startDate,
                              @ApiParam(value = "考试日期-终止") @RequestParam(required = false) Long endDate) {
         Set<Long> orgIds = teachcloudCommonService.listSubOrgIds(null);
-        if (Objects.isNull(printPlanIdList)){
+        if (Objects.isNull(printPlanIdList)) {
             printPlanIdList = new ArrayList<>();
         }
         List<Long> idList = printPlanIdList.stream().map(SystemConstant::convertIdToLong).collect(Collectors.toList());
         Long printId = null;
-        if (idList.size() > 0){
+        if (idList.size() > 0) {
             printId = idList.get(0);
         }
         Map<String, Object> map = tbTaskService.saveTask(TaskTypeEnum.EXAMINATION_EXPORT, printId);

distributed-print/src/main/java/com/qmth/distributed/print/api/ExamPrintPlanController.java

@@ -31,10 +31,13 @@ import com.qmth.teachcloud.common.util.ServletUtil;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
 import java.io.IOException;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -50,6 +53,7 @@ import java.util.stream.Collectors;
 @Api(tags = "印刷计划管理Controller")
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.exam}/print")
+@Validated
 public class ExamPrintPlanController {
     @Resource
     private ExamPrintPlanService examPrintPlanService;
@@ -75,11 +79,11 @@ public class ExamPrintPlanController {
                                     @ApiParam(value = "印刷计划状态") @RequestParam(required = false) PrintPlanStatusEnum status,
                                     @ApiParam(value = "计划创建时间段开始时间") @RequestParam(required = false) Long startTime,
                                     @ApiParam(value = "计划创建时间段结束时间") @RequestParam(required = false) Long endTime,
-                                    @ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber,
-                                    @ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
+                                    @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
+                                    @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
 
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
-        if (Objects.isNull(printPlanIdList)){
+        if (Objects.isNull(printPlanIdList)) {
             printPlanIdList = new ArrayList<>();
         }
         List<Long> idList = printPlanIdList.stream().map(SystemConstant::convertIdToLong).collect(Collectors.toList());
@@ -128,11 +132,12 @@ public class ExamPrintPlanController {
 
     /**
      * 关联试卷管理-查询
+     *
      * @param relateType
      * @param printPlanIdList 印刷计划id集合
      * @param courseCode
      * @param paperNumber
-     * @param userName 命题老师
+     * @param userName        命题老师
      * @param pageNumber
      * @param pageSize
      * @return
@@ -145,13 +150,13 @@ public class ExamPrintPlanController {
                              @RequestParam(value = "paperNumber", required = false) String paperNumber,
                              @RequestParam(value = "userName", required = false) String userName,
                              @RequestParam(value = "cardRuleId", required = false) Long cardRuleId,
-                             @RequestParam Integer pageNumber,
-                             @RequestParam Integer pageSize) {
-        if (Objects.isNull(printPlanIdList)){
+                             @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
+                             @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
+        if (Objects.isNull(printPlanIdList)) {
             printPlanIdList = new ArrayList<>();
         }
         List<Long> idList = printPlanIdList.stream().map(SystemConstant::convertIdToLong).collect(Collectors.toList());
-        IPage<ExamTaskDetailDto> examTasks = examTaskDetailService.list(relateType, idList, courseCode, paperNumber,userName,cardRuleId, pageNumber, pageSize);
+        IPage<ExamTaskDetailDto> examTasks = examTaskDetailService.list(relateType, idList, courseCode, paperNumber, userName, cardRuleId, pageNumber, pageSize);
         return ResultUtil.ok(examTasks);
     }
 
@@ -209,8 +214,8 @@ public class ExamPrintPlanController {
                            @RequestParam(value = "examEndTime", required = false) Long examEndTime,
                            @RequestParam(value = "printStartTime", required = false) Long printStartTime,
                            @RequestParam(value = "printEndTime", required = false) Long printEndTime,
-                           @RequestParam Integer pageNumber,
-                           @RequestParam Integer pageSize) {
+                           @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
+                           @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
         IPage<PrintTaskDto> examTasks = examDetailService.listPrintTask(printPlanId, status, courseCode, paperNumber, examPlace, examRoom, examStartTime, examEndTime, printStartTime, printEndTime, pageNumber, pageSize);
         return ResultUtil.ok(examTasks);
     }

distributed-print/src/main/java/com/qmth/distributed/print/api/ExamPrintPlanSyncController.java

@@ -10,9 +10,12 @@ import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
 import com.qmth.teachcloud.common.util.ServletUtil;
 import io.swagger.annotations.*;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -27,6 +30,7 @@ import java.util.List;
 @Api(tags = "印刷计划管理Controller")
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.exam}/print_sync")
+@Validated
 public class ExamPrintPlanSyncController {
     @Resource
     private ExamPrintPlanService examPrintPlanService;
@@ -47,9 +51,8 @@ public class ExamPrintPlanSyncController {
     public Result findPrintPlanPage(@ApiParam(value = "印刷计划ID") @RequestParam(required = false) Long printPlanId,
                                     @ApiParam(value = "计划创建时间段开始时间") @RequestParam(required = false) Long startTime,
                                     @ApiParam(value = "计划创建时间段结束时间") @RequestParam(required = false) Long endTime,
-                                    @ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber,
-                                    @ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
-
+                                    @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
+                                    @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         return ResultUtil.ok(examPrintPlanService.printPlanSyncPage(schoolId, printPlanId, startTime, endTime, pageNumber, pageSize));
     }

distributed-print/src/main/java/com/qmth/distributed/print/api/ExamTaskController.java

@@ -1,7 +1,5 @@
 package com.qmth.distributed.print.api;
 
-import com.qmth.boot.api.annotation.Aac;
-import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.boot.api.exception.ApiException;
 import com.qmth.distributed.print.business.bean.dto.ExamTaskDetailCardDto;
@@ -10,7 +8,6 @@ import com.qmth.distributed.print.business.bean.dto.ExamTaskPrintDto;
 import com.qmth.distributed.print.business.bean.params.ApproveFormParams;
 import com.qmth.distributed.print.business.bean.params.ExamTaskApplyParam;
 import com.qmth.distributed.print.business.bean.params.ExamTaskPrintParams;
-import com.qmth.distributed.print.business.bean.params.PrintPlanParams;
 import com.qmth.distributed.print.business.bean.result.EditResult;
 import com.qmth.distributed.print.business.entity.*;
 import com.qmth.distributed.print.business.enums.ExamStatusEnum;
@@ -18,10 +15,8 @@ import com.qmth.distributed.print.business.enums.MakeMethodEnum;
 import com.qmth.distributed.print.business.enums.MessageEnum;
 import com.qmth.distributed.print.business.enums.ReviewStatusEnum;
 import com.qmth.distributed.print.business.service.*;
-import com.qmth.distributed.print.business.templete.execute.AsyncCreatePdfTempleteService;
 import com.qmth.distributed.print.business.templete.execute.AsyncTaskReviewSampleExportService;
 import com.qmth.teachcloud.common.bean.params.ArraysParams;
-import com.qmth.teachcloud.common.contant.SpringContextHolder;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.BasicAttachment;
 import com.qmth.teachcloud.common.entity.SysUser;
@@ -29,7 +24,6 @@ import com.qmth.teachcloud.common.entity.TBTask;
 import com.qmth.teachcloud.common.enums.*;
 import com.qmth.teachcloud.common.service.BasicAttachmentService;
 import com.qmth.teachcloud.common.service.BasicStudentService;
-import com.qmth.teachcloud.common.service.TBTaskService;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
 import com.qmth.teachcloud.common.util.ServletUtil;
@@ -39,13 +33,15 @@ import org.activiti.engine.task.Task;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
 import java.io.IOException;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -61,7 +57,7 @@ import java.util.stream.Collectors;
 @Api(tags = "命题任务Controller")
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.exam}/task")
-
+@Validated
 public class ExamTaskController {
 
     @Autowired
@@ -128,8 +124,8 @@ public class ExamTaskController {
                        @RequestParam(required = false) Long endTime,
                        @RequestParam(required = false) String userName,
                        @RequestParam(required = false) String createName,
-                       @RequestParam Integer pageNumber,
-                       @RequestParam Integer pageSize) {
+                       @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
+                       @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
         return ResultUtil.ok(examTaskService.list(enable, status, SystemConstant.convertIdToLong(cardRuleId), courseCode, paperNumber, startTime, endTime, userName, createName, pageNumber, pageSize));
     }
 
@@ -289,8 +285,8 @@ public class ExamTaskController {
                                 @RequestParam(value = "startTime", required = false) Long startTime,
                                 @RequestParam(value = "endTime", required = false) Long endTime,
                                 @RequestParam(value = "userName", required = false) String userName,
-                                @RequestParam("pageNumber") Integer pageNumber,
-                                @RequestParam("pageSize") Integer pageSize) {
+                                @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
+                                @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
         return ResultUtil.ok(examTaskService.listTaskApply(auditStatus, SystemConstant.convertIdToLong(cardRuleId), courseCode, paperNumber, startTime, endTime, userName, pageNumber, pageSize));
     }
 
@@ -372,8 +368,8 @@ public class ExamTaskController {
                                           @RequestParam(value = "startCreateTime", required = false) Long startCreateTime,
                                           @RequestParam(value = "endCreateTime", required = false) Long endCreateTime,
                                           @RequestParam(value = "createName", required = false) String createName,
-                                          @RequestParam("pageNumber") Integer pageNumber,
-                                          @RequestParam("pageSize") Integer pageSize) {
+                                          @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
+                                          @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
         return ResultUtil.ok(examTaskService.listTaskReviewUnaudited(courseCode, paperNumber, userId, SystemConstant.convertIdToLong(cardRuleId), startTime, endTime, startCreateTime, endCreateTime, createName, pageNumber, pageSize));
     }
 
@@ -406,8 +402,8 @@ public class ExamTaskController {
                                         @RequestParam(value = "startCreateTime", required = false) Long startCreateTime,
                                         @RequestParam(value = "endCreateTime", required = false) Long endCreateTime,
                                         @RequestParam(value = "createName", required = false) String createName,
-                                        @RequestParam("pageNumber") Integer pageNumber,
-                                        @RequestParam("pageSize") Integer pageSize) {
+                                        @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
+                                        @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
         return ResultUtil.ok(examTaskService.listTaskReviewAudited(reviewStatus, courseCode, paperNumber, userId, SystemConstant.convertIdToLong(cardRuleId), startTime, endTime, startCreateTime, endCreateTime, createName, pageNumber, pageSize));
     }
 
@@ -516,8 +512,8 @@ public class ExamTaskController {
                                 @RequestParam(value = "endTime", required = false) Long endTime,
                                 @RequestParam(value = "makeMethod", required = false) MakeMethodEnum makeMethod,
                                 @RequestParam(value = "cardRuleId", required = false) String cardRuleId,
-                                @RequestParam("pageNumber") Integer pageNumber,
-                                @RequestParam("pageSize") Integer pageSize) {
+                                @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
+                                @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
         return ResultUtil.ok(examTaskService.listTaskPaper(courseCode, paperNumber, startTime, endTime, makeMethod, SystemConstant.convertIdToLong(cardRuleId), pageNumber, pageSize));
     }
 
@@ -775,8 +771,8 @@ public class ExamTaskController {
     @ApiOperation(value = "卷库查询-发布印刷任务-查看考生")
     @RequestMapping(value = "/list_task_print_student", method = RequestMethod.POST)
     public Result listTaskPrintStudent(@RequestParam(value = "classId") String classId,
-                                       @RequestParam Integer pageNumber,
-                                       @RequestParam Integer pageSize) {
+                                       @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
+                                       @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
         Set<Long> classIds = Arrays.stream(classId.split(",")).map(SystemConstant::convertIdToLong).collect(Collectors.toSet());
         return ResultUtil.ok(basicStudentService.basicStudentPage(null, null, classIds, pageNumber, pageSize));
     }
@@ -817,7 +813,7 @@ public class ExamTaskController {
             throw ExceptionResultEnum.ERROR.exception(bindingResult.getAllErrors().get(0).getDefaultMessage());
         }
         HttpServletResponse response = ServletUtil.getResponse();
-        examTaskService.findExamTaskApprovalPdf(response,approveFormParams.getExamTaskId(), approveFormParams.getHtmlContent());
+        examTaskService.findExamTaskApprovalPdf(response, approveFormParams.getExamTaskId(), approveFormParams.getHtmlContent());
     }
 
     @ApiOperation(value = "命题任务-考试对象查询")

distributed-print/src/main/java/com/qmth/distributed/print/api/SysUserController.java

@@ -21,11 +21,14 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
 import java.security.NoSuchAlgorithmException;
 import java.util.List;
 import java.util.Map;
@@ -42,6 +45,7 @@ import java.util.Objects;
 @Api(tags = "用户Controller")
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.sys}/user")
+@Validated
 //@Aac(strict = BOOL.FALSE, auth = BOOL.FALSE)
 public class SysUserController {
     private final static Logger log = LoggerFactory.getLogger(SysUserController.class);
@@ -67,8 +71,8 @@ public class SysUserController {
                        @RequestParam(value = "roleId", required = false) String roleId,
                        @RequestParam(value = "enable", required = false) Boolean enable,
                        @RequestParam(value = "realName", required = false) String realName,
-                       @RequestParam(value = "pageNumber", required = true) Integer pageNumber,
-                       @RequestParam(value = "pageSize", required = true) Integer pageSize) {
+                       @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
+                       @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
         return ResultUtil.ok(sysUserService.list(loginName, roleId, enable,realName, pageNumber, pageSize));
     }
 
@@ -83,8 +87,8 @@ public class SysUserController {
     @RequestMapping(value = "/list_customer", method = RequestMethod.POST)
     public Result listCustomer(@RequestParam(value = "realName", required = false) String realName,
                                @RequestParam(value = "enable", required = false) Boolean enable,
-                               @RequestParam(value = "pageNumber", required = true) Integer pageNumber,
-                               @RequestParam(value = "pageSize", required = true) Integer pageSize) {
+                               @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
+                               @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
         return ResultUtil.ok(sysUserService.listCustomer(realName, enable, pageNumber, pageSize));
     }
 

distributed-print/src/main/java/com/qmth/distributed/print/api/TBTaskController.java

@@ -24,12 +24,15 @@ import com.qmth.teachcloud.common.util.ServletUtil;
 import io.swagger.annotations.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
 import java.io.IOException;
 import java.util.*;
 
@@ -44,6 +47,7 @@ import java.util.*;
 @Api(tags = "数据管理-任务管理Controller")
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.data}")
+@Validated
 public class TBTaskController {
     private final static Logger log = LoggerFactory.getLogger(TBTaskController.class);
 
@@ -60,8 +64,8 @@ public class TBTaskController {
                             @ApiParam(value = "任务状态", required = false) @RequestParam(required = false) TaskStatusEnum status,
                             @ApiParam(value = "任务类型", required = false) @RequestParam(required = false) TaskTypeEnum type,
                             @ApiParam(value = "任务数据结果", required = false) @RequestParam(required = false) TaskResultEnum result,
-                            @ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber,
-                            @ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
+                            @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
+                            @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
         IPage<TaskListResult> taskListResultIPage = tbTaskService.query(new Page<>(pageNumber, pageSize), Objects.nonNull(ServletUtil.getRequestHeaderSchoolId()) ? Long.parseLong(ServletUtil.getRequestHeaderSchoolId().toString()) : null, SystemConstant.convertIdToLong(printPlanId), status, type, result);
         if (Objects.nonNull(taskListResultIPage) && Objects.nonNull(taskListResultIPage.getRecords()) && taskListResultIPage.getRecords().size() > 0) {
             List<TaskListResult> taskListResultList = taskListResultIPage.getRecords();

distributed-print/src/main/java/com/qmth/distributed/print/api/TCStatisticsController.java

@@ -18,6 +18,7 @@ import com.qmth.teachcloud.common.util.ServletUtil;
 import io.swagger.annotations.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -25,6 +26,8 @@ import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
 import java.util.Map;
 import java.util.Objects;
 
@@ -39,6 +42,7 @@ import java.util.Objects;
 @Api(tags = "命题统计Controller")
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.statistics}")
+@Validated
 //@Aac(auth = BOOL.FALSE, strict = BOOL.FALSE)
 public class TCStatisticsController {
     private final static Logger log = LoggerFactory.getLogger(TCStatisticsController.class);
@@ -70,8 +74,8 @@ public class TCStatisticsController {
                        @ApiParam(value = "完成状态", required = false) @RequestParam(required = false) StatisticsStatusEnum status,
                        @ApiParam(value = "课程名称", required = false) @RequestParam(required = false) String courseName,
                        @ApiParam(value = "任课老师名称", required = false) @RequestParam(required = false) String teacherName,
-                       @ApiParam(value = "页码", required = true) @RequestParam Integer pageNumber,
-                       @ApiParam(value = "数量", required = true) @RequestParam Integer pageSize) {
+                       @ApiParam(value = "页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
+                       @ApiParam(value = "数量", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         return ResultUtil.ok(tcStatisticsService.list(new Page<>(pageNumber, pageSize), SystemConstant.convertIdToLong(collegeId), SystemConstant.convertIdToLong(teachingRoomId), status, courseName, teacherName, sysUser.getSchoolId()));
     }

distributed-print/src/main/java/com/qmth/distributed/print/api/TFFlowController.java

@@ -34,11 +34,14 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.DuplicateKeyException;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.BindingResult;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
@@ -56,6 +59,7 @@ import java.util.Objects;
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.flow}")
 //@Aac(auth = BOOL.FALSE, strict = BOOL.FALSE)
+@Validated
 public class TFFlowController {
     private final static Logger log = LoggerFactory.getLogger(TFFlowController.class);
 
@@ -145,8 +149,8 @@ public class TFFlowController {
     @ApiResponses({@ApiResponse(code = 200, message = "流程信息", response = TFFlow.class)})
     @RequestMapping(value = "/list", method = RequestMethod.POST)
     public Result list(@ApiParam(value = "流程名称", required = false) @RequestParam(required = false) String name,
-                       @ApiParam(value = "页码", required = true) @RequestParam Integer pageNumber,
-                       @ApiParam(value = "数量", required = true) @RequestParam Integer pageSize) {
+                       @ApiParam(value = "页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
+                       @ApiParam(value = "数量", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         return ResultUtil.ok(tfFlowService.list(new Page<>(pageNumber, pageSize), name, SystemConstant.getHeadOrUserSchoolId(), sysUser.getOrgId()));
     }
@@ -185,8 +189,8 @@ public class TFFlowController {
     @ApiResponses({@ApiResponse(code = 200, message = "流程审批记录信息", response = FlowApproveResult.class)})
     @RequestMapping(value = "/approve/list", method = RequestMethod.POST)
     public Result taskApproveList(@ApiParam(value = "发起人名称", required = false) @RequestParam(required = false) String startName,
-                                  @ApiParam(value = "页码", required = true) @RequestParam Integer pageNumber,
-                                  @ApiParam(value = "数量", required = true) @RequestParam Integer pageSize) {
+                                  @ApiParam(value = "页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
+                                  @ApiParam(value = "数量", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         return ResultUtil.ok(tfFlowService.flowApproveList(new Page<>(pageNumber, pageSize), startName, SystemConstant.getHeadOrUserSchoolId(), sysUser.getOrgId(), null));
     }

distributed-print/src/main/java/com/qmth/distributed/print/api/WorkController.java

@@ -13,12 +13,15 @@ import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
 import com.qmth.teachcloud.common.util.ServletUtil;
 import io.swagger.annotations.*;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
 import java.util.Objects;
 
 /**
@@ -32,67 +35,17 @@ import java.util.Objects;
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.work}")
 //@Aac(auth = BOOL.FALSE, strict = BOOL.FALSE)
+@Validated
 public class WorkController {
 
     @Resource
     ExamTaskService examTaskService;
 
-    //    @ApiOperation(value = "命题待办接口")
-//    @RequestMapping(value = "/exam/task/ready", method = RequestMethod.POST)
-//    @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = WorkResult.class)})
-//    public Result examTaskReady(@RequestParam(value = "pageNumber", required = true) Integer pageNumber,
-//                                @RequestParam(value = "pageSize", required = true) Integer pageSize) {
-//        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-//        return ResultUtil.ok(examTaskService.queryUserByMyWork(new Page<>(pageNumber, pageSize), sysUser.getId(), sysUser.getSchoolId(), ExamStatusEnum.READY.name(), ExamStatusEnum.STAGE.name()));
-//    }
-//
-//    @ApiOperation(value = "命题待办计数接口")
-//    @RequestMapping(value = "/exam/task/ready_count", method = RequestMethod.POST)
-//    @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = WorkResult.class)})
-//    public Result examTaskReadyCount() {
-//        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-//        return ResultUtil.ok(examTaskService.queryUserByMyWork(new Page<>(SystemConstant.PAGE_NUMBER, SystemConstant.PAGE_SIZE), sysUser.getId(), sysUser.getSchoolId(), ExamStatusEnum.READY.name(), ExamStatusEnum.STAGE.name()).getRecords().size());
-//    }
-//
-//    @ApiOperation(value = "命题分配待办接口")
-//    @RequestMapping(value = "/exam/task/new", method = RequestMethod.POST)
-//    @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = WorkResult.class)})
-//    public Result examTaskNew(@RequestParam(value = "pageNumber", required = true) Integer pageNumber,
-//                              @RequestParam(value = "pageSize", required = true) Integer pageSize) {
-//        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-//        return ResultUtil.ok(examTaskService.queryByMyWork(new Page<>(pageNumber, pageSize), sysUser.getId(), sysUser.getSchoolId(), ExamStatusEnum.NEW.name()));
-//    }
-//
-//    @ApiOperation(value = "命题分配待办计数接口")
-//    @RequestMapping(value = "/exam/task/new_count", method = RequestMethod.POST)
-//    @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = WorkResult.class)})
-//    public Result examTaskNewCount() {
-//        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-//        return ResultUtil.ok(examTaskService.queryByMyWork(new Page<>(SystemConstant.PAGE_NUMBER, SystemConstant.PAGE_SIZE), sysUser.getId(), sysUser.getSchoolId(), ExamStatusEnum.NEW.name()).getRecords().size());
-//    }
-//
-//    @ApiOperation(value = "审核待办接口")
-//    @RequestMapping(value = "/exam/task/submit", method = RequestMethod.POST)
-//    @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = WorkResult.class)})
-//    public Result examTaskSubmit(@RequestParam(value = "pageNumber", required = true) Integer pageNumber,
-//                                 @RequestParam(value = "pageSize", required = true) Integer pageSize) {
-//        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-//        return ResultUtil.ok(examTaskService.queryByMyWorkSubmit(new Page<>(pageNumber, pageSize), sysUser.getId(), sysUser.getSchoolId(), ExamStatusEnum.SUBMIT));
-//    }
-//
-//    @ApiOperation(value = "审核待办计数接口")
-//    @RequestMapping(value = "/exam/task/submit_count", method = RequestMethod.POST)
-//    @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = WorkResult.class)})
-//    public Result examTaskSubmitCount() {
-//        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-//        return ResultUtil.ok(examTaskService.queryByMyWorkSubmit(new Page<>(SystemConstant.PAGE_NUMBER, SystemConstant.PAGE_SIZE), sysUser.getId(), sysUser.getSchoolId(), ExamStatusEnum.SUBMIT).getRecords().size());
-//    }
-
     @ApiOperation(value = "获取待办接口")
     @RequestMapping(value = "/exam/task/ready", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = WorkResult.class)})
-    public Result getFlowTaskReady(@ApiParam(value = "页码", required = true) @RequestParam Integer pageNumber,
-                                   @ApiParam(value = "数量", required = true) @RequestParam Integer pageSize) {
+    public Result getFlowTaskReady(@ApiParam(value = "页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
+                                   @ApiParam(value = "数量", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         return ResultUtil.ok(examTaskService.getFlowTaskReadyList(new Page<>(pageNumber, pageSize), SystemConstant.getHeadOrUserSchoolId(), sysUser.getOrgId(), sysUser.getId()));
     }

teachcloud-common-api/src/main/java/com/qmth/teachcloud/common/api/api/SysRoleController.java

@@ -1,6 +1,7 @@
 package com.qmth.teachcloud.common.api.api;
 
 import com.qmth.boot.api.constant.ApiConstant;
+import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.SysRole;
 import com.qmth.teachcloud.common.service.SysRoleService;
 import com.qmth.teachcloud.common.util.Result;
@@ -9,9 +10,12 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
 import java.security.NoSuchAlgorithmException;
 
 /**
@@ -25,6 +29,7 @@ import java.security.NoSuchAlgorithmException;
 @Api(tags = "角色Controller")
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.sys}/role")
+@Validated
 public class SysRoleController {
 
     @Autowired
@@ -43,8 +48,8 @@ public class SysRoleController {
     @RequestMapping(value = "/list", method = RequestMethod.POST)
     public Result list(@RequestParam(value = "name", required = false) String name,
                        @RequestParam(value = "enable", required = false) Boolean enable,
-                       @RequestParam(value = "pageNumber", required = true) Integer pageNumber,
-                       @RequestParam(value = "pageSize", required = true) Integer pageSize) {
+                       @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
+                       @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
         return ResultUtil.ok(sysRoleService.list(name, enable, pageNumber, pageSize));
     }
 

teachcloud-common/src/main/java/com/qmth/teachcloud/common/contant/SystemConstant.java

@@ -61,6 +61,9 @@ public class SystemConstant {
     public static final String DEFAULT_DATE_PATTERN = "yyyy-MM-dd HH:mm:ss";
     public static final int PAGE_NUMBER = 0;
     public static final int PAGE_SIZE = 10000000;
+    public static final int PAGE_SIZE_MIN = 10;
+    public static final int PAGE_SIZE_MAX = 500;
+    public static final int PAGE_NUMBER_MIN = 1;
     public static final int ALL_CARD = -1;
     public static final String MANUAL = "manual";
     public static final String DELIMITER = ":";

teachcloud-common/src/main/resources/mapper/BasicClazzMapper.xml

@@ -22,7 +22,7 @@
                 AND cap.enable = TRUE
         <where>
             AND clz.enable = TRUE
-            <if test="schoolId != null and schoolId > 0">
+            <if test="schoolId != null and schoolId != ''">
                 AND clz.school_id = #{schoolId}
             </if>
             <if test="queryParams != null and queryParams != ''">

teachcloud-common/src/main/resources/mapper/BasicCourseMapper.xml

@@ -80,19 +80,19 @@
                 AND org.type = 'TEACHING_ROOM'
                 AND org.enable = TRUE
         <where>
-            <if test="courseName != null and courseName.length > 0">
+            <if test="courseName != null and courseName != ''">
                 AND bc.name LIKE CONCAT('%',#{courseName},'%')
             </if>
-            <if test="startCreateTime != null and startCreateTime > 0">
+            <if test="startCreateTime != null and startCreateTime != ''">
                 AND bc.create_time >= #{startCreateTime}
             </if>
-            <if test="endCreateTime != null and endCreateTime > 0">
+            <if test="endCreateTime != null and endCreateTime != ''">
                 AND #{endCreateTime} >= bc.create_time
             </if>
             <if test="enable != null">
                 AND bc.enable = #{enable}
             </if>
-            <if test="schoolId != null and schoolId > 0">
+            <if test="schoolId != null and schoolId != ''">
                 and bc.school_id = #{schoolId}
             </if>
             <if test="orgIds != null and orgIds.size > 0">

teachcloud-common/src/main/resources/mapper/BasicStudentMapper.xml

@@ -54,10 +54,10 @@
             <if test="queryParams != null and queryParams != ''">
                 and (student_name like concat('%',#{queryParams},'%') or student_code like concat('%',#{queryParams},'%'))
             </if>
-            <if test="schoolId != null and schoolId > 0">
+            <if test="schoolId != null and schoolId != ''">
                 and stu.school_id = #{schoolId}
             </if>
-            <if test="campusId != null and campusId > 0">
+            <if test="campusId != null and campusId != ''">
                 and stu.campus_Id = #{campusId}
             </if>
             <if test="clazzIdList != null">

teachcloud-report/src/main/java/com/qmth/teachcloud/report/api/CourseController.java

@@ -23,12 +23,15 @@ import com.qmth.teachcloud.report.business.enums.SemesterEnum;
 import com.qmth.teachcloud.report.business.service.*;
 import com.qmth.teachcloud.report.business.templete.execute.AsyncDataCalculateTempleteService;
 import io.swagger.annotations.*;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -36,6 +39,7 @@ import java.util.Objects;
 @Api(tags = "课程Controller")
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.reportCourse}")
+@Validated
 public class CourseController {
 
     @Resource
@@ -53,17 +57,14 @@ public class CourseController {
     @Resource
     AsyncDataCalculateTempleteService asyncDataCalculateTempleteService;
 
-    @Resource
-    TBPaperService tbPaperService;
-
     @ApiOperation(value = "开课课程考试总览列表接口")
     @RequestMapping(value = "/survey_teacher/list", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "考试科目信息", response = TAExamCourseResult.class)})
     public Result surveyTeacherList(@ApiParam(value = "考试id", required = true) @RequestParam String examId,
                                     @ApiParam(value = "学期", required = true) @RequestParam SemesterEnum semester,
                                     @ApiParam(value = "学校id", required = false) @RequestParam(required = false) String schoolId,
-                                    @ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber,
-                                    @ApiParam(value = "分页数", required = true) @RequestParam int pageSize,
+                                    @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
+                                    @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize,
                                     @ApiParam(value = "排序列", required = false) @RequestParam(required = false) String column,
                                     @ApiParam(value = "排序规则", required = false) @RequestParam(required = false) OrderEnum order) {
         return ResultUtil.ok(taExamCourseService.surveyTeacherList(new Page<>(pageNumber, pageSize), SystemConstant.convertIdToLong(examId), semester, Objects.isNull(schoolId) ? SystemConstant.convertIdToLong(String.valueOf(ServletUtil.getRequestHeaderSchoolId())) : SystemConstant.convertIdToLong(schoolId), column, order));
@@ -101,8 +102,8 @@ public class CourseController {
                                            @ApiParam(value = "学期", required = true) @RequestParam SemesterEnum semester,
                                            @ApiParam(value = "学校id", required = false) @RequestParam(required = false) String schoolId,
                                            @ApiParam(value = "科目编码", required = true) @RequestParam String courseCode,
-                                           @ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber,
-                                           @ApiParam(value = "分页数", required = true) @RequestParam int pageSize,
+                                           @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
+                                           @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize,
                                            @ApiParam(value = "排序列", required = false) @RequestParam(required = false) String column,
                                            @ApiParam(value = "排序规则", required = false) @RequestParam(required = false) OrderEnum order) {
         return ResultUtil.ok(taExamCourseService.surveyTeacherTeacherView(new Page<>(pageNumber, pageSize), Objects.isNull(schoolId) ? SystemConstant.convertIdToLong(String.valueOf(ServletUtil.getRequestHeaderSchoolId())) : SystemConstant.convertIdToLong(schoolId), semester, SystemConstant.convertIdToLong(examId), courseCode, column, order));
@@ -187,8 +188,8 @@ public class CourseController {
                                      @ApiParam(value = "考试id", required = true) @RequestParam String examId,
                                      @ApiParam(value = "科目编码", required = false) @RequestParam(required = false) String courseCode,
                                      @ApiParam(value = "发布状态", required = false) @RequestParam(required = false) PublishStatusEnum publishStatus,
-                                     @ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber,
-                                     @ApiParam(value = "分页数", required = true) @RequestParam int pageSize,
+                                     @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
+                                     @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize,
                                      @ApiParam(value = "排序列", required = false) @RequestParam(required = false) String column,
                                      @ApiParam(value = "排序规则", required = false) @RequestParam(required = false) OrderEnum order) {
         return ResultUtil.ok(taExamCourseService.surveyAspointsList(new Page<>(pageNumber, pageSize), Objects.isNull(schoolId) ? SystemConstant.convertIdToLong(String.valueOf(ServletUtil.getRequestHeaderSchoolId())) : SystemConstant.convertIdToLong(schoolId), SystemConstant.convertIdToLong(examId), courseCode, publishStatus, semester, column, order));

teachcloud-report/src/main/java/com/qmth/teachcloud/report/api/DataDriveController.java

@@ -16,18 +16,22 @@ import com.qmth.teachcloud.report.business.service.TAExamCourseTeacherService;
 import com.qmth.teachcloud.report.business.service.TAExamTotalService;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
 import java.util.Map;
 import java.util.Objects;
 
 @Api(tags = "数据驾驶舱Controller")
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.reportSchool}")
+@Validated
 public class DataDriveController {
 
     @Autowired
@@ -52,8 +56,8 @@ public class DataDriveController {
     @ApiResponses({@ApiResponse(code = 200, message = "全校考试总览-全校考试概况", response = TAExamCourse.class)})
     public Result getCourseSummary(@ApiParam(value = "学期", required = true) @RequestParam SemesterEnum semester,
                                    @ApiParam(value = "考试ID", required = true) @RequestParam Long examId,
-                                   @ApiParam(value = "分页页码", required = true) @RequestParam Integer pageNumber,
-                                   @ApiParam(value = "分页数量", required = true) @RequestParam Integer pageSize,
+                                   @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
+                                   @ApiParam(value = "分页数量", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize,
                                    @ApiParam(value = "排序列", required = false) @RequestParam(required = false) String column,
                                    @ApiParam(value = "排序规则", required = false) @RequestParam(required = false) OrderEnum order) {
         return ResultUtil.ok(taExamTotalService.getCourseSummary(semester, examId, pageNumber, pageSize, column, order));
@@ -92,8 +96,8 @@ public class DataDriveController {
     public Result listTeacherClassRank(@ApiParam(value = "学期", required = true) @RequestParam SemesterEnum semester,
                                        @ApiParam(value = "考试ID", required = true) @RequestParam Long examId,
                                        @ApiParam(value = "课程代码", required = true) @RequestParam String courseCode,
-                                       @ApiParam(value = "分页页码", required = true) @RequestParam Integer pageNumber,
-                                       @ApiParam(value = "分页数量", required = true) @RequestParam Integer pageSize,
+                                       @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
+                                       @ApiParam(value = "分页数量", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize,
                                        @ApiParam(value = "排序列", required = false) @RequestParam(required = false) String column,
                                        @ApiParam(value = "排序规则", required = false) @RequestParam(required = false) OrderEnum order) {
         return ResultUtil.ok(taExamCourseCollegeTeacherService.listTeacherClassRank(semester, examId, courseCode, pageNumber, pageSize, column, order));
@@ -115,8 +119,8 @@ public class DataDriveController {
                                           @ApiParam(value = "考查学院ID", required = true) @RequestParam(required = false) Long inspectCollegeId,
                                           @ApiParam(value = "课程代码", required = true) @RequestParam(required = false) String courseCode,
                                           @ApiParam(value = "教师ID", required = true) @RequestParam(required = false) Long teacherId,
-                                          @ApiParam(value = "分页页码", required = true) @RequestParam Integer pageNumber,
-                                          @ApiParam(value = "分页数量", required = true) @RequestParam Integer pageSize,
+                                          @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
+                                          @ApiParam(value = "分页数量", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize,
                                           @ApiParam(value = "排序列", required = false) @RequestParam(required = false) String column,
                                           @ApiParam(value = "排序规则", required = false) @RequestParam(required = false) OrderEnum order) {
         return ResultUtil.ok(taExamCourseCollegeTeacherService.listAllTeacherClassRank(semester, examId, inspectCollegeId, courseCode, teacherId, pageNumber, pageSize, column, order));

teachcloud-report/src/main/java/com/qmth/teachcloud/report/api/StudentReportController.java

@@ -11,16 +11,20 @@ import com.qmth.teachcloud.report.business.bean.result.TBExamStudentResult;
 import com.qmth.teachcloud.report.business.enums.SemesterEnum;
 import com.qmth.teachcloud.report.business.service.TBExamStudentService;
 import io.swagger.annotations.*;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
 
 @Api(tags = "学生报告Controller")
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.reportExamStudent}")
+@Validated
 public class StudentReportController {
 
     @Resource
@@ -36,8 +40,8 @@ public class StudentReportController {
                              @ApiParam(value = "班级id", required = true) @RequestParam(required = false) String clazzId,
                              @ApiParam(value = "是否缺考", required = true) @RequestParam(required = false) Boolean isAbsent,
                              @ApiParam(value = "学号", required = true) @RequestParam(required = false) String studentCode,
-                             @ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber,
-                             @ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
+                             @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
+                             @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
         return ResultUtil.ok(tbExamStudentService.reportList(new Page<>(pageNumber, pageSize), SystemConstant.convertIdToLong(schoolId),
                 SystemConstant.convertIdToLong(examId),
                 SystemConstant.convertIdToLong(collegeId),

teachcloud-report/src/main/java/com/qmth/teachcloud/report/api/TAExamCourseCollegeTeacherController.java

@@ -2,6 +2,7 @@ package com.qmth.teachcloud.report.api;
 
 
 import com.qmth.boot.api.constant.ApiConstant;
+import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
 import com.qmth.teachcloud.report.business.bean.result.TBExamStudentResult;
@@ -12,11 +13,15 @@ import com.qmth.teachcloud.report.business.enums.SemesterEnum;
 import com.qmth.teachcloud.report.business.service.TAExamCourseCollegeTeacherService;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+
 /**
  * <p>
  * 参考课程学院下授课教师维度分析表 前端控制器
@@ -28,6 +33,7 @@ import org.springframework.web.bind.annotation.RestController;
 @Api(tags = "教研分析教师模板Controller")
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.reportSchool}/teacher")
+@Validated
 public class TAExamCourseCollegeTeacherController {
 
     @Autowired
@@ -41,8 +47,8 @@ public class TAExamCourseCollegeTeacherController {
             @ApiParam(value = "考试ID", required = true) @RequestParam Long examId,
             @ApiParam(value = "课程代码", required = false) @RequestParam(required = false) String courseCode,
             @ApiParam(value = "考查学院ID", required = false) @RequestParam(required = false) Long inspectCollegeId,
-            @ApiParam(value = "分页页码", required = true) @RequestParam Integer pageNumber,
-            @ApiParam(value = "分页数量", required = true) @RequestParam Integer pageSize,
+            @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
+            @ApiParam(value = "分页数量", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize,
             @ApiParam(value = "排序列", required = false) @RequestParam(required = false) String column,
             @ApiParam(value = "排序规则", required = false) @RequestParam(required = false) OrderEnum order) {
         return ResultUtil.ok(taExamCourseCollegeTeacherService.listClassRank(semester, examId, courseCode, inspectCollegeId, pageNumber, pageSize, column, order));
@@ -56,8 +62,8 @@ public class TAExamCourseCollegeTeacherController {
             @ApiParam(value = "考试ID", required = true) @RequestParam Long examId,
             @ApiParam(value = "课程代码", required = false) @RequestParam(required = false) String courseCode,
             @ApiParam(value = "考查学院ID", required = false) @RequestParam(required = false) Long inspectCollegeId,
-            @ApiParam(value = "分页页码", required = true) @RequestParam Integer pageNumber,
-            @ApiParam(value = "分页数量", required = true) @RequestParam Integer pageSize,
+            @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
+            @ApiParam(value = "分页数量", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize,
             @ApiParam(value = "排序列", required = false) @RequestParam(required = false) String column,
             @ApiParam(value = "排序规则", required = false) @RequestParam(required = false) OrderEnum order) {
         return ResultUtil.ok(taExamCourseCollegeTeacherService.listMyClassRank(semester, examId, courseCode, inspectCollegeId, pageNumber, pageSize, column, order));

teachcloud-report/src/main/java/com/qmth/teachcloud/report/api/TBExamStudentController.java

@@ -3,6 +3,7 @@ package com.qmth.teachcloud.report.api;
 
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.boot.api.exception.ApiException;
+import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.BasicAttachment;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
@@ -17,6 +18,7 @@ import com.qmth.teachcloud.report.business.enums.SemesterEnum;
 import com.qmth.teachcloud.report.business.service.TBExamStudentService;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -24,6 +26,8 @@ import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
 import java.util.Objects;
 
 /**
@@ -37,6 +41,7 @@ import java.util.Objects;
 @Api(tags = "教研分析学生模块Controller")
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.reportSchool}/student")
+@Validated
 public class TBExamStudentController {
 
     @Autowired
@@ -56,8 +61,8 @@ public class TBExamStudentController {
             @ApiParam(value = "考查学院ID", required = true) @RequestParam(required = false) Long inspectCollegeId,
             @ApiParam(value = "教师ID", required = true) @RequestParam(required = false) Long teacherId,
             @ApiParam(value = "模糊查询", required = true) @RequestParam(required = false) String studentParam,
-            @ApiParam(value = "分页页码", required = true) @RequestParam Integer pageNumber,
-            @ApiParam(value = "分页数量", required = true) @RequestParam Integer pageSize,
+            @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
+            @ApiParam(value = "分页数量", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize,
             @ApiParam(value = "排序列", required = false) @RequestParam(required = false) String column,
             @ApiParam(value = "排序规则", required = false) @RequestParam(required = false) OrderEnum order) {
         return ResultUtil.ok(tbExamStudentService.listTeachCollegeResult(semester, examId, courseCode, current, inspectCollegeId, teacherId, studentParam, pageNumber, pageSize, column, order));
@@ -117,8 +122,8 @@ public class TBExamStudentController {
             @ApiParam(value = "教师ID", required = true) @RequestParam(required = false) Long teacherId,
             @ApiParam(value = "班级ID", required = true) @RequestParam(required = false) Long clazzId,
             @ApiParam(value = "模糊查询", required = true) @RequestParam(required = false) String studentParam,
-            @ApiParam(value = "分页页码", required = true) @RequestParam Integer pageNumber,
-            @ApiParam(value = "分页数量", required = true) @RequestParam Integer pageSize,
+            @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
+            @ApiParam(value = "分页数量", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize,
             @ApiParam(value = "排序列", required = false) @RequestParam(required = false) String column,
             @ApiParam(value = "排序规则", required = false) @RequestParam(required = false) OrderEnum order) {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();