fix:升级qmth-boot -> 1.0.4

pom.xml

@@ -9,7 +9,7 @@
 
 	<properties>
 		<spring-boot.version>2.3.12.RELEASE</spring-boot.version>
-		<qmth-boot-version>1.0.2</qmth-boot-version>
+		<qmth-boot-version>1.0.4</qmth-boot-version>
 		<maven-compiler-version>3.8.1</maven-compiler-version>
 		<maven-surefire-version>2.22.2</maven-surefire-version>
 		<maven.compiler.source>1.8</maven.compiler.source>

src/main/java/cn/com/qmth/print/manage/controller/BaseController.java

@@ -1,29 +1,22 @@
 package cn.com.qmth.print.manage.controller;
 
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.lang.reflect.Field;
-import java.net.URLEncoder;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import cn.com.qmth.print.manage.config.PmConstants;
+import cn.com.qmth.print.manage.service.PmSession;
+import cn.com.qmth.print.manage.utils.ObjectUtil;
+import com.qmth.boot.core.exception.StatusException;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
-import cn.com.qmth.print.manage.config.PmConstants;
-import cn.com.qmth.print.manage.service.PmSession;
-import cn.com.qmth.print.manage.utils.ObjectUtil;
-
-import com.qmth.boot.core.exception.StatusException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.*;
+import java.lang.reflect.Field;
+import java.net.URLEncoder;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 public class BaseController {
 

src/main/java/cn/com/qmth/print/manage/controller/BreakRecordController.java

@@ -13,12 +13,11 @@ import cn.com.qmth.print.manage.service.PmSession;
 import cn.com.qmth.print.manage.service.query.RecordQuery;
 
 import com.qmth.boot.api.annotation.Aac;
-import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.api.constant.ApiConstant;
 
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/break")
-@Aac(strict = BOOL.FALSE, auth = BOOL.TRUE)
+@Aac(strict = false, auth = true)
 public class BreakRecordController extends BaseController {
 
     @Resource
@@ -31,14 +30,14 @@ public class BreakRecordController extends BaseController {
 
     @RequestMapping("/start")
     public Object start(@RequestAttribute PmSession accessEntity, @RequestParam Long examId,
-            @RequestParam String startNumber) {
+                        @RequestParam String startNumber) {
         Long userId = getAccessUserId(accessEntity);
         return breakRecordService.start(userId, examId, startNumber);
     }
 
     @RequestMapping("/end")
     public Object end(@RequestAttribute PmSession accessEntity, @RequestParam Long id, @RequestParam Long examId,
-            @RequestParam String endNumber) {
+                      @RequestParam String endNumber) {
         Long userId = getAccessUserId(accessEntity);
         return breakRecordService.end(id, userId, examId, endNumber);
     }

src/main/java/cn/com/qmth/print/manage/controller/CheckRecordController.java

@@ -1,24 +1,21 @@
 package cn.com.qmth.print.manage.controller;
 
-import javax.annotation.Resource;
-
+import cn.com.qmth.print.manage.service.CheckRecordService;
+import cn.com.qmth.print.manage.service.PmSession;
+import cn.com.qmth.print.manage.service.query.RecordQuery;
+import com.qmth.boot.api.annotation.Aac;
+import com.qmth.boot.api.constant.ApiConstant;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import cn.com.qmth.print.manage.service.CheckRecordService;
-import cn.com.qmth.print.manage.service.PmSession;
-import cn.com.qmth.print.manage.service.query.RecordQuery;
-
-import com.qmth.boot.api.annotation.Aac;
-import com.qmth.boot.api.annotation.BOOL;
-import com.qmth.boot.api.constant.ApiConstant;
+import javax.annotation.Resource;
 
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/check")
-@Aac(strict = BOOL.FALSE, auth = BOOL.TRUE)
+@Aac(strict = false, auth = true)
 public class CheckRecordController extends BaseController {
 
     @Resource
@@ -31,14 +28,14 @@ public class CheckRecordController extends BaseController {
 
     @RequestMapping("/start")
     public Object start(@RequestAttribute PmSession accessEntity, @RequestParam(required = false) Long id,
-            @RequestParam Long examId, @RequestParam String startNumber) {
+                        @RequestParam Long examId, @RequestParam String startNumber) {
         Long userId = getAccessUserId(accessEntity);
         return checkRecordService.start(id, userId, examId, startNumber);
     }
 
     @RequestMapping("/end")
     public Object end(@RequestAttribute PmSession accessEntity, @RequestParam Long id, @RequestParam Long examId,
-            @RequestParam String endNumber) {
+                      @RequestParam String endNumber) {
         Long userId = getAccessUserId(accessEntity);
         return checkRecordService.end(id, userId, examId, endNumber);
     }

src/main/java/cn/com/qmth/print/manage/controller/ConditionController.java

@@ -1,12 +1,10 @@
 package cn.com.qmth.print.manage.controller;
 
-import cn.com.qmth.print.manage.config.PmConstants;
 import cn.com.qmth.print.manage.entity.ExamStudentEntity;
 import cn.com.qmth.print.manage.enums.GroupType;
 import cn.com.qmth.print.manage.enums.RecordStatus;
 import cn.com.qmth.print.manage.service.ExamStudentService;
 import com.qmth.boot.api.annotation.Aac;
-import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.api.constant.ApiConstant;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
@@ -24,7 +22,7 @@ import java.util.stream.Collectors;
  */
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/condition")
-@Aac(strict = BOOL.FALSE, auth = BOOL.TRUE)
+@Aac(strict = false, auth = true)
 public class ConditionController {
 
     @Autowired
@@ -53,8 +51,7 @@ public class ConditionController {
     /**
      * 准考证列表
      *
-     * @param examId
-     *            批次ID
+     * @param examId 批次ID
      * @return
      */
     @RequestMapping(value = "/list_exam_number", method = RequestMethod.POST)
@@ -71,8 +68,7 @@ public class ConditionController {
     /**
      * 科目列表
      *
-     * @param examId
-     *            批次ID
+     * @param examId 批次ID
      * @return
      */
     @RequestMapping(value = "/list_course_code", method = RequestMethod.POST)
@@ -89,8 +85,7 @@ public class ConditionController {
     /**
      * 考点列表
      *
-     * @param examId
-     *            批次ID
+     * @param examId 批次ID
      * @return
      */
     @RequestMapping(value = "/list_exam_site", method = RequestMethod.POST)
@@ -106,8 +101,7 @@ public class ConditionController {
     /**
      * 考场列表
      *
-     * @param examId
-     *            批次ID
+     * @param examId 批次ID
      * @return
      */
     @RequestMapping(value = "/list_exam_room", method = RequestMethod.POST)

src/main/java/cn/com/qmth/print/manage/controller/ExamController.java

@@ -9,7 +9,6 @@ import cn.com.qmth.print.manage.service.UserService;
 import cn.com.qmth.print.manage.service.query.ExamQuery;
 import cn.com.qmth.print.manage.utils.PathUtil;
 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.core.exception.StatusException;
 import org.springframework.validation.annotation.Validated;
@@ -24,7 +23,7 @@ import java.util.Objects;
  */
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/exam")
-@Aac(strict = BOOL.FALSE, auth = BOOL.TRUE)
+@Aac(strict = false, auth = true)
 public class ExamController extends BaseController {
 
     @Resource
@@ -39,7 +38,7 @@ public class ExamController extends BaseController {
      * @return
      */
     @RequestMapping(value = "/page", method = RequestMethod.POST)
-    public Object page(@RequestAttribute PmSession accessEntity,@Validated ExamQuery query) {
+    public Object page(@RequestAttribute PmSession accessEntity, @Validated ExamQuery query) {
         Long userId = getAccessUserId(accessEntity);
         UserEntity requestUser = userService.getById(userId);
         if (RoleMeta.PRINT_LEADER.equals(requestUser.getRole())) {
@@ -86,7 +85,7 @@ public class ExamController extends BaseController {
     @RequestMapping(value = "/template", method = RequestMethod.POST)
     public void getImportTemplate() {
         String resourcePath = PathUtil.getResoucePath("importtemplates/examImportTemplate.xlsx");
-        if (Objects.isNull(resourcePath)){
+        if (Objects.isNull(resourcePath)) {
             throw new StatusException("未找到模板路径");
         }
         exportFile("学校导入模板.xlsx", new File(resourcePath));

src/main/java/cn/com/qmth/print/manage/controller/ExamStudentController.java

@@ -4,9 +4,7 @@ import cn.com.qmth.print.manage.service.ExamStudentService;
 import cn.com.qmth.print.manage.service.query.ExamStudentQuery;
 import cn.com.qmth.print.manage.utils.PathUtil;
 import com.qmth.boot.api.annotation.Aac;
-import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.api.constant.ApiConstant;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -21,7 +19,7 @@ import java.io.IOException;
  */
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/student")
-@Aac(strict = BOOL.FALSE, auth = BOOL.TRUE)
+@Aac(strict = false, auth = true)
 public class ExamStudentController extends BaseController {
 
     @Resource
@@ -39,8 +37,9 @@ public class ExamStudentController extends BaseController {
 
     /**
      * 导出云阅卷考生数据
+     *
      * @param response response
-     * @param examId 考试id
+     * @param examId   考试id
      * @throws IOException 异常
      */
     @RequestMapping(value = "/export", method = RequestMethod.POST)

src/main/java/cn/com/qmth/print/manage/controller/OrgController.java

@@ -2,23 +2,22 @@ package cn.com.qmth.print.manage.controller;
 
 import cn.com.qmth.print.manage.service.OrgService;
 import cn.com.qmth.print.manage.service.query.OrgQuery;
-
 import com.qmth.boot.api.annotation.Aac;
-import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.api.constant.ApiConstant;
-
 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.RestController;
 
+import javax.annotation.Resource;
+
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/org")
-@Aac(strict = BOOL.FALSE, auth = BOOL.TRUE)
+@Aac(strict = false, auth = true)
 public class OrgController {
 
-    @Autowired
+    @Resource
     private OrgService orgService;
 
     /**
@@ -52,5 +51,4 @@ public class OrgController {
         orgService.pull();
         return true;
     }
-
 }

src/main/java/cn/com/qmth/print/manage/controller/SysController.java

@@ -10,7 +10,6 @@ import cn.com.qmth.print.manage.service.UserService;
 import cn.com.qmth.print.manage.vo.CommonQueryVo;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.qmth.boot.api.annotation.Aac;
-import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.api.constant.ApiConstant;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -49,7 +48,7 @@ public class SysController extends BaseController {
         return authService.login(loginName, password);
     }
 
-    @Aac(strict = BOOL.FALSE, auth = BOOL.TRUE)
+    @Aac(strict = false, auth = true)
     @PostMapping("/logout")
     public void logout(@RequestAttribute PmSession accessEntity) {
         authService.logout(accessEntity);
@@ -68,7 +67,7 @@ public class SysController extends BaseController {
      * @param creatorDpr   是否启用当前人为用户创建人权限
      * @return 用户集合
      */
-    @Aac(strict = BOOL.FALSE, auth = BOOL.TRUE)
+    @Aac(strict = false, auth = true)
     @ApiOperation(value = "公共接口-查询用户数据")
     @RequestMapping(value = "/common/find_user_list", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = CommonQueryVo.class)})
@@ -109,7 +108,7 @@ public class SysController extends BaseController {
      * @param userId 印点负责人id
      * @return 考试批次集合
      */
-    @Aac(strict = BOOL.FALSE, auth = BOOL.TRUE)
+    @Aac(strict = false, auth = true)
     @ApiOperation(value = "公共接口-查询考试批次数据")
     @RequestMapping(value = "/common/find_exam_list", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = CommonQueryVo.class)})

src/main/java/cn/com/qmth/print/manage/controller/UserController.java

@@ -8,16 +8,15 @@ import cn.com.qmth.print.manage.service.UserService;
 import cn.com.qmth.print.manage.service.query.UserQuery;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 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.core.exception.StatusException;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.annotation.Resource;
 import java.io.IOException;
 import java.util.Date;
 import java.util.Objects;
@@ -27,10 +26,10 @@ import java.util.Objects;
  */
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/user")
-@Aac(strict = BOOL.FALSE, auth = BOOL.TRUE)
+@Aac(strict = false, auth = true)
 public class UserController extends BaseController {
 
-    @Autowired
+    @Resource
     private UserService userService;
 
     /**
@@ -44,10 +43,10 @@ public class UserController extends BaseController {
         Long userId = getAccessUserId(accessEntity);
         UserEntity requestUser = userService.getById(userId);
         Long printUserId = null;
-        if (RoleMeta.PRINT_LEADER.equals(requestUser.getRole())){
+        if (RoleMeta.PRINT_LEADER.equals(requestUser.getRole())) {
             printUserId = userId;
         }
-        return userService.pageQuery(printUserId,query);
+        return userService.pageQuery(printUserId, query);
     }
 
     /**