3.3.0 update

distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/TSyncStmmsExamMapper.java

@@ -1,10 +0,0 @@
-package com.qmth.distributed.print.business.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.qmth.distributed.print.business.entity.TSyncStmmsExam;
-
-/**
- * 云阅卷考试表 Mapper 接口
- */
-public interface TSyncStmmsExamMapper extends BaseMapper<TSyncStmmsExam> {
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/TSyncStmmsExamService.java

@@ -1,20 +0,0 @@
-package com.qmth.distributed.print.business.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.qmth.distributed.print.business.entity.TSyncStmmsExam;
-
-import java.util.List;
-
-/**
- * 云阅卷考试表 服务类
- */
-public interface TSyncStmmsExamService extends IService<TSyncStmmsExam> {
-
-    List<TSyncStmmsExam> listExam(String orgCode);
-
-    List<TSyncStmmsExam> syncExam(String orgCode);
-
-    TSyncStmmsExam getBySchoolIdAndExamId(Long schoolId, String orgCode, Long thirdRelateId);
-
-    TSyncStmmsExam getBySchoolIdAndOrgCodeAndExamName(Long schoolId, String orgCode, String thirdRelateName);
-}

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

@@ -5,7 +5,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.qmth.boot.api.exception.ApiException;
 import com.qmth.distributed.print.business.bean.dto.ExamDetailCourseDto;
-import com.qmth.distributed.print.business.bean.dto.RelatePaperDto;
 import com.qmth.distributed.print.business.bean.dto.SyncExamStudentDto;
 import com.qmth.distributed.print.business.bean.dto.SyncExamTaskDto;
 import com.qmth.distributed.print.business.bean.marking.status.ExamPaperStructureStatus;
@@ -52,8 +51,6 @@ public class DataSyncServiceImpl implements DataSyncService {
     @Resource
     private ExamTaskSyncService examTaskSyncService;
 
-    @Resource
-    private TSyncStmmsExamService tSyncStmmsExamService;
 
     @Resource
     private TBSyncTaskService tbSyncTaskService;
@@ -128,10 +125,10 @@ public class DataSyncServiceImpl implements DataSyncService {
                     saveSchool(schoolId, orgCode, byCode.getName());
                 }
                 // 查询本地库中云阅卷考试Id是否存在
-                TSyncStmmsExam tSyncStmmsExam = tSyncStmmsExamService.getBySchoolIdAndOrgCodeAndExamName(schoolId, orgCode, thirdRelateName);
-                if (tSyncStmmsExam != null) {
-                    thirdRelateId = Long.valueOf(tSyncStmmsExam.getExamId());
-                }
+//                TSyncStmmsExam tSyncStmmsExam = tSyncStmmsExamService.getBySchoolIdAndOrgCodeAndExamName(schoolId, orgCode, thirdRelateName);
+//                if (tSyncStmmsExam != null) {
+//                    thirdRelateId = Long.valueOf(tSyncStmmsExam.getExamId());
+//                }
 
                 // 前置方法已经校验过各课程下是否有学院代码
                 // 同步考试
@@ -690,18 +687,18 @@ public class DataSyncServiceImpl implements DataSyncService {
             throw ExceptionResultEnum.ERROR.exception(e.getMessage());
         }
         try {
-            TSyncStmmsExam tSyncStmmsExam = tSyncStmmsExamService.getBySchoolIdAndExamId(schoolId, orgCode, thirdRelateId);
-            if (tSyncStmmsExam == null) {
-                tSyncStmmsExam = new TSyncStmmsExam();
-                tSyncStmmsExam.setId(SystemConstant.getDbUuid());
-                tSyncStmmsExam.setSchoolId(schoolId);
-                if (StringUtils.isNotBlank(orgCode)) {
-                    tSyncStmmsExam.setOrgCode(orgCode);
-                }
-                tSyncStmmsExam.setExamId(thirdRelateId.intValue());
-                tSyncStmmsExam.setExamName(thirdRelateName);
-                tSyncStmmsExamService.save(tSyncStmmsExam);
-            }
+//            TSyncStmmsExam tSyncStmmsExam = tSyncStmmsExamService.getBySchoolIdAndExamId(schoolId, orgCode, thirdRelateId);
+//            if (tSyncStmmsExam == null) {
+//                tSyncStmmsExam = new TSyncStmmsExam();
+//                tSyncStmmsExam.setId(SystemConstant.getDbUuid());
+//                tSyncStmmsExam.setSchoolId(schoolId);
+//                if (StringUtils.isNotBlank(orgCode)) {
+//                    tSyncStmmsExam.setOrgCode(orgCode);
+//                }
+//                tSyncStmmsExam.setExamId(thirdRelateId.intValue());
+//                tSyncStmmsExam.setExamName(thirdRelateName);
+//                tSyncStmmsExamService.save(tSyncStmmsExam);
+//            }
         } catch (Exception e) {
             throw ExceptionResultEnum.ERROR.exception("保存云阅卷考试数据失败");
         }

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

@@ -6,12 +6,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.distributed.print.business.entity.TSyncExamLog;
-import com.qmth.distributed.print.business.entity.TSyncStmmsExam;
 import com.qmth.distributed.print.business.mapper.TSyncExamLogMapper;
 import com.qmth.distributed.print.business.service.TSyncExamLogService;
-import com.qmth.distributed.print.business.service.TSyncStmmsExamService;
 import com.qmth.distributed.print.business.templete.execute.AsyncScorePushService;
-import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.enums.TaskStatusEnum;
@@ -31,9 +28,6 @@ public class TSyncExamLogServiceImpl extends ServiceImpl<TSyncExamLogMapper, TSy
     @Resource
     AsyncScorePushService asyncScorePushService;
 
-    @Resource
-    private TSyncStmmsExamService tSyncStmmsExamService;
-
     @Resource
     private TeachcloudCommonService teachcloudCommonService;
 
@@ -51,10 +45,10 @@ public class TSyncExamLogServiceImpl extends ServiceImpl<TSyncExamLogMapper, TSy
         for (TSyncExamLog record : examLogResultIPage.getRecords()) {
             TSyncExamLog tSyncExamLog = this.selectBySchoolIdAndSemesterIdAndExamId(schoolId, semesterId, examId, record.getThirdRelateId());
             if (tSyncExamLog == null) {
-                TSyncStmmsExam tSyncStmmsExam = tSyncStmmsExamService.getBySchoolIdAndExamId(schoolId, null, examId);
-                if (tSyncStmmsExam != null) {
-                    record.setExamName(tSyncStmmsExam.getExamName());
-                }
+//                TSyncStmmsExam tSyncStmmsExam = tSyncStmmsExamService.getBySchoolIdAndExamId(schoolId, null, examId);
+//                if (tSyncStmmsExam != null) {
+//                    record.setExamName(tSyncStmmsExam.getExamName());
+//                }
             } else {
                 BeanUtils.copyProperties(tSyncExamLog, record);
             }
@@ -101,14 +95,14 @@ public class TSyncExamLogServiceImpl extends ServiceImpl<TSyncExamLogMapper, TSy
             }
         }
 
-        TSyncStmmsExam tSyncStmmsExam = tSyncStmmsExamService.getBySchoolIdAndExamId(sysUser.getSchoolId(), null, thirdRelateId);
-        String examName = tSyncStmmsExam == null ? null : tSyncStmmsExam.getExamName();
-        TSyncExamLog tSyncExamLog = new TSyncExamLog(sysUser.getSchoolId(), semesterId, examId, thirdRelateId, examName, TaskStatusEnum.INIT, sysUser.getId(), System.currentTimeMillis());
-        boolean isSave = this.save(tSyncExamLog);
-        if (!isSave) {
-            throw ExceptionResultEnum.ERROR.exception("创建同步任务失败，请联系管理员");
-        }
-        asyncScorePushService.pushTask(tSyncExamLog);
+//        TSyncStmmsExam tSyncStmmsExam = tSyncStmmsExamService.getBySchoolIdAndExamId(sysUser.getSchoolId(), null, thirdRelateId);
+//        String examName = tSyncStmmsExam == null ? null : tSyncStmmsExam.getExamName();
+//        TSyncExamLog tSyncExamLog = new TSyncExamLog(sysUser.getSchoolId(), semesterId, examId, thirdRelateId, examName, TaskStatusEnum.INIT, sysUser.getId(), System.currentTimeMillis());
+//        boolean isSave = this.save(tSyncExamLog);
+//        if (!isSave) {
+//            throw ExceptionResultEnum.ERROR.exception("创建同步任务失败，请联系管理员");
+//        }
+//        asyncScorePushService.pushTask(tSyncExamLog);
     }
 
     @Override

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

@@ -1,109 +0,0 @@
-package com.qmth.distributed.print.business.service.impl;
-
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qmth.distributed.print.business.entity.TSyncStmmsExam;
-import com.qmth.distributed.print.business.mapper.TSyncStmmsExamMapper;
-import com.qmth.distributed.print.business.service.TSyncStmmsExamService;
-import com.qmth.teachcloud.common.contant.SystemConstant;
-import com.qmth.teachcloud.common.entity.SysOrg;
-import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
-import com.qmth.teachcloud.common.service.SysOrgService;
-import com.qmth.teachcloud.common.sync.CloudMarkingTaskUtils;
-import com.qmth.teachcloud.common.util.ServletUtil;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
-import java.util.List;
-import java.util.stream.Collectors;
-
-@Service
-public class TSyncStmmsExamServiceImpl extends ServiceImpl<TSyncStmmsExamMapper, TSyncStmmsExam> implements TSyncStmmsExamService {
-
-    @Resource
-    private SysOrgService sysOrgService;
-    @Resource
-    CloudMarkingTaskUtils cloudMarkingTaskUtils;
-
-    @Override
-    public List<TSyncStmmsExam> listExam(String orgCode) {
-        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
-        if (cloudMarkingTaskUtils.isCollegeMode(schoolId) && StringUtils.isBlank(orgCode)) {
-            throw ExceptionResultEnum.ERROR.exception("当前学校配置为按学院推送，请传入学院代码。若无法解决，请联系管理员。");
-        }
-        QueryWrapper<TSyncStmmsExam> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(TSyncStmmsExam::getSchoolId, schoolId)
-                .orderByDesc(TSyncStmmsExam::getExamId);
-        if (StringUtils.isNotBlank(orgCode)) {
-            queryWrapper.lambda().eq(TSyncStmmsExam::getOrgCode, orgCode);
-        } else {
-            queryWrapper.lambda().isNull(TSyncStmmsExam::getOrgCode);
-        }
-        return this.list(queryWrapper);
-    }
-
-    @Transactional
-    @Override
-    public List<TSyncStmmsExam> syncExam(String orgCode) {
-        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
-        if (cloudMarkingTaskUtils.isCollegeMode(schoolId)) {
-            if (StringUtils.isBlank(orgCode)) {
-                throw ExceptionResultEnum.ERROR.exception("当前学校配置为按学院推送，请传入学院代码。若无法解决，请联系管理员。");
-            } else {
-                SysOrg sysOrg = sysOrgService.findByCode(schoolId, orgCode);
-                cloudMarkingTaskUtils.syncSchool(schoolId, orgCode, sysOrg.getName());
-            }
-        }
-        UpdateWrapper<TSyncStmmsExam> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.lambda().eq(TSyncStmmsExam::getSchoolId, schoolId);
-        this.remove(updateWrapper);
-
-        String orgCodeTrim = StringUtils.isBlank(orgCode) ? null : orgCode.trim();
-
-        List<JSONObject> objectList = cloudMarkingTaskUtils.getExam(schoolId, orgCodeTrim, SystemConstant.PAGE_NUMBER_MIN, SystemConstant.PAGE_SIZE);
-        if (objectList.isEmpty()) {
-            throw ExceptionResultEnum.ERROR.exception("未查询到云阅卷考试");
-        }
-        List<TSyncStmmsExam> markingExams = objectList.stream().map(m -> {
-            TSyncStmmsExam cloudMarkingExam = new TSyncStmmsExam();
-            cloudMarkingExam.setId(SystemConstant.getDbUuid());
-            cloudMarkingExam.setSchoolId(schoolId);
-            cloudMarkingExam.setOrgCode(orgCodeTrim);
-            cloudMarkingExam.setExamId(m.getInteger("id"));
-            cloudMarkingExam.setExamName(m.getString("name"));
-            return cloudMarkingExam;
-        }).collect(Collectors.toList());
-        if (!markingExams.isEmpty()) {
-            this.saveBatch(markingExams);
-        }
-        return markingExams;
-    }
-
-    @Override
-    public TSyncStmmsExam getBySchoolIdAndExamId(Long schoolId, String orgCode, Long thirdRelateId) {
-        QueryWrapper<TSyncStmmsExam> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(TSyncStmmsExam::getSchoolId, schoolId)
-                .eq(TSyncStmmsExam::getExamId, thirdRelateId);
-        if (StringUtils.isNotBlank(orgCode)) {
-            queryWrapper.lambda().eq(TSyncStmmsExam::getOrgCode, orgCode);
-        }
-        return this.getOne(queryWrapper);
-    }
-
-    @Override
-    public TSyncStmmsExam getBySchoolIdAndOrgCodeAndExamName(Long schoolId, String orgCode, String thirdRelateName) {
-        QueryWrapper<TSyncStmmsExam> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(TSyncStmmsExam::getSchoolId, schoolId)
-                .eq(TSyncStmmsExam::getExamName, thirdRelateName);
-        if (StringUtils.isNotBlank(orgCode)) {
-            queryWrapper.lambda().eq(TSyncStmmsExam::getOrgCode, orgCode);
-        } else {
-            queryWrapper.lambda().isNull(TSyncStmmsExam::getOrgCode);
-        }
-        return this.getOne(queryWrapper);
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/execute/AsyncCloudMarkingTaskService.java

@@ -3,20 +3,16 @@ package com.qmth.distributed.print.business.templete.execute;
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.qmth.distributed.print.business.bean.dto.SyncExamTaskDto;
-import com.qmth.distributed.print.business.bean.marking.GroupInfo;
 import com.qmth.distributed.print.business.bean.params.SyncDataParam;
 import com.qmth.distributed.print.business.entity.ExamPaperStructure;
 import com.qmth.distributed.print.business.entity.TBSyncTask;
 import com.qmth.distributed.print.business.service.DataSyncService;
 import com.qmth.distributed.print.business.service.TBSyncTaskService;
-import com.qmth.distributed.print.business.service.TSyncStmmsExamService;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.enums.PushTypeEnum;
-import com.qmth.teachcloud.common.service.SysOrgService;
 import com.qmth.teachcloud.common.sync.CloudMarkingTaskUtils;
 import com.qmth.teachcloud.common.util.ServletUtil;
-import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.annotation.Lazy;
@@ -34,12 +30,6 @@ public class AsyncCloudMarkingTaskService {
 
     private final static Logger log = LoggerFactory.getLogger(AsyncCloudMarkingTaskService.class);
 
-    @Resource
-    private SysOrgService sysOrgService;
-
-    @Resource
-    private TSyncStmmsExamService tSyncStmmsExamService;
-
     @Lazy
     @Resource
     private DataSyncService dataSyncService;

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

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.qmth.distributed.print.business.mapper.TSyncStmmsExamMapper">
-</mapper>

distributed-print/install/mysql/upgrade/3.3.0.sql

@@ -123,3 +123,15 @@ INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('1003', '任务释放', '/api/scan/task/omr/release', 'URL', '970', '33', 'AUTH', '1', '1', '1');
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('1004', '任务历史', '/api/scan/task/omr/history', 'URL', '970', '34', 'AUTH', '1', '1', '1');
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('1005', '答题卡二次识别', '/api/scan/answer/refix', 'URL', '970', '35', 'AUTH', '1', '1', '1');
+DELETE FROM `sys_privilege` WHERE (`id` = '392');
+DELETE FROM `sys_privilege` WHERE (`id` = '393');
+DELETE FROM `sys_privilege` WHERE (`id` = '394');
+DELETE FROM `sys_privilege` WHERE (`id` = '395');
+DELETE FROM `sys_privilege` WHERE (`id` = '396');
+DELETE FROM `sys_privilege` WHERE (`id` = '397');
+DELETE FROM `sys_privilege` WHERE (`id` = '398');
+DELETE FROM `sys_privilege` WHERE (`id` = '399');
+DELETE FROM `sys_privilege` WHERE (`id` = '431');
+DELETE FROM `sys_privilege` WHERE (`id` = '435');
+DELETE FROM `sys_privilege` WHERE (`id` = '792');
+DELETE FROM `sys_privilege` WHERE (`id` = '793');

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

@@ -1,47 +0,0 @@
-package com.qmth.distributed.print.api;
-
-import com.qmth.boot.api.constant.ApiConstant;
-import com.qmth.distributed.print.business.service.TSyncStmmsExamService;
-import com.qmth.teachcloud.common.annotation.OperationLogDetail;
-import com.qmth.teachcloud.common.contant.SystemConstant;
-import com.qmth.teachcloud.common.enums.log.CustomizedOperationTypeEnum;
-import com.qmth.teachcloud.common.util.Result;
-import com.qmth.teachcloud.common.util.ResultUtil;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-
-/**
- * <p>
- * 云阅卷考试表 前端控制器
- * </p>
- */
-@RestController
-@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + SystemConstant.PREFIX_URL_BASIC + "/stmms_exam")
-public class TSyncStmmsExamController {
-
-    @Resource
-    private TSyncStmmsExamService tSyncStmmsExamService;
-
-    /**
-     * 查询云阅卷考试
-     */
-    @ApiOperation(value = "查询云阅卷考试")
-    @PostMapping("/list")
-    public Result listExam(@RequestParam(value = "orgCode", required = false) String orgCode) {
-        return ResultUtil.ok(tSyncStmmsExamService.listExam(orgCode));
-    }
-
-    /**
-     * 同步云阅卷考试
-     */
-    @ApiOperation(value = "同步云阅卷考试")
-    @PostMapping("/sync")
-    public Result syncExam(@RequestParam(value = "orgCode", required = false) String orgCode) {
-        return ResultUtil.ok(tSyncStmmsExamService.syncExam(orgCode));
-    }
-}

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

@@ -5,7 +5,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.google.common.collect.Lists;
 import com.qmth.boot.api.annotation.Aac;
-import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.teachcloud.common.bean.params.UserSaveParams;
 import com.qmth.teachcloud.common.contant.SystemConstant;
@@ -1353,7 +1352,7 @@ public class BasicDatasourceController {
     @RequestMapping(value = "/user_teacher/delete", method = RequestMethod.POST)
     @Transactional(rollbackFor = Exception.class)
     @ApiResponses({@ApiResponse(code = 200, message = "{\"success\":true}", response = Result.class)})
-    @Aac(strict = BOOL.FALSE, auth = BOOL.FALSE)
+    @Aac(strict = false, auth = false)
     public Result userTeacherDelete(@ApiParam(value = "用户id", required = true) @RequestParam List<String> idList) {
         if (CollectionUtils.isEmpty(idList)) {
             throw ExceptionResultEnum.ERROR.exception("请选择要删除的用户");
@@ -1367,7 +1366,7 @@ public class BasicDatasourceController {
     @RequestMapping(value = "/basic_teacher/import", method = RequestMethod.POST)
     @Transactional(rollbackFor = Exception.class)
     @ApiResponses({@ApiResponse(code = 200, message = "{\"success\":true}", response = Result.class)})
-    @Aac(strict = BOOL.FALSE, auth = BOOL.FALSE)
+    @Aac(strict = false, auth = false)
     public Result basicTeacherImport(@ApiParam(value = "上传文件", required = true) @RequestParam MultipartFile file,
                                      @ApiParam(value = "学校id", required = true) @RequestParam String schoolId) throws Exception {
         return ResultUtil.ok(tbTeacherService.importBasicTeacherInfo(file, SystemConstant.convertIdToLong(schoolId)));
@@ -1377,7 +1376,7 @@ public class BasicDatasourceController {
     @RequestMapping(value = "/sync/teacher", method = RequestMethod.POST)
     @Transactional(rollbackFor = Exception.class)
     @ApiResponses({@ApiResponse(code = 200, message = "{\"success\":true}", response = Result.class)})
-    @Aac(strict = BOOL.FALSE, auth = BOOL.FALSE)
+    @Aac(strict = false, auth = false)
     public Result syncTeacherInfo(@ApiParam(value = "学校id", required = true) @RequestParam String schoolId) {
         tbTeacherService.syncTeacherInfoToSysUser(SystemConstant.convertIdToLong(schoolId));
         return ResultUtil.ok();
@@ -1387,7 +1386,7 @@ public class BasicDatasourceController {
     @RequestMapping(value = "/special/assignCheck", method = RequestMethod.POST)
     @Transactional(rollbackFor = Exception.class)
     @ApiResponses({@ApiResponse(code = 200, message = "{\"success\":true}", response = Result.class)})
-    @Aac(strict = BOOL.FALSE, auth = BOOL.FALSE)
+    @Aac(strict = false, auth = false)
     public Result assignCheck(@ApiParam(value = "上传文件", required = true) @RequestParam MultipartFile file, @RequestParam Long examId, @RequestParam Long schoolId,
                               @ApiParam(value = "该Excel中包含多科目赋分时，各科目编号用','隔开", required = true) @RequestParam String courseCodeS) throws IOException, NoSuchFieldException {
 
@@ -1461,7 +1460,7 @@ public class BasicDatasourceController {
     @RequestMapping(value = "/build/demo_table", method = RequestMethod.POST)
     @Transactional(rollbackFor = Exception.class)
     @ApiResponses({@ApiResponse(code = 200, message = "{\"success\":true}", response = Result.class)})
-    @Aac(strict = BOOL.FALSE, auth = BOOL.FALSE)
+    @Aac(strict = false, auth = false)
     public Result buildDemoTable() throws ExecutionException, InterruptedException {
         courseUnitOperateService.createDemoData();
         return ResultUtil.ok();
@@ -1471,7 +1470,7 @@ public class BasicDatasourceController {
     @RequestMapping(value = "/build/migrate_org", method = RequestMethod.POST)
     @Transactional(rollbackFor = Exception.class)
     @ApiResponses({@ApiResponse(code = 200, message = "{\"success\":true}", response = Result.class)})
-    @Aac(strict = BOOL.FALSE, auth = BOOL.FALSE)
+    @Aac(strict = false, auth = false)
     public Result migrateOrg(@Valid @RequestBody List<CollegeCombineParams> collegeCombineParamsListList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());

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

@@ -1,7 +1,6 @@
 package com.qmth.teachcloud.report.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.teachcloud.common.bean.params.BasicSemesterParams;
 import com.qmth.teachcloud.common.bean.params.TBExamCourseDeleteParams;
@@ -85,7 +84,7 @@ public class OpenApiController {
     @ApiOperation(value = "学期创建/更新接口")
     @ApiResponses({@ApiResponse(code = 200, message = "学期创建/更新接口", response = Object.class)})
     @RequestMapping(value = "/semester_edit", method = RequestMethod.POST)
-    @Aac(auth = BOOL.FALSE)
+    @Aac(auth = false)
     public Result semesterEdit(@ApiParam(value = "接收学期数据信息", required = true) @RequestBody String result) throws IOException, IllegalAccessException {
         Optional.ofNullable(result).orElseThrow(() -> ExceptionResultEnum.PARAMS_ERROR.exception("数据为空"));
         String decodeJson = URLDecoder.decode(result, SystemConstant.CHARSET_NAME);
@@ -100,7 +99,7 @@ public class OpenApiController {
     @ApiOperation(value = "考试创建/更新接口")
     @ApiResponses({@ApiResponse(code = 200, message = "考试创建/更新接口", response = Object.class)})
     @RequestMapping(value = "/exam_edit", method = RequestMethod.POST)
-    @Aac(auth = BOOL.FALSE)
+    @Aac(auth = false)
     public Result examEdit(@ApiParam(value = "接收考试数据信息", required = true) @RequestBody String result) throws IOException {
         Optional.ofNullable(result).orElseThrow(() -> ExceptionResultEnum.PARAMS_ERROR.exception("数据为空"));
         String decodeJson = URLDecoder.decode(result, SystemConstant.CHARSET_NAME);
@@ -116,7 +115,7 @@ public class OpenApiController {
     @ApiOperation(value = "考试删除接口")
     @ApiResponses({@ApiResponse(code = 200, message = "考试删除接口", response = Object.class)})
     @RequestMapping(value = "/exam_delete", method = RequestMethod.POST)
-    @Aac(auth = BOOL.FALSE)
+    @Aac(auth = false)
     public Result examDelete(@ApiParam(value = "删除考试数据信息", required = true) @RequestBody String result) throws IOException {
         Optional.ofNullable(result).orElseThrow(() -> ExceptionResultEnum.PARAMS_ERROR.exception("数据为空"));
         String decodeJson = URLDecoder.decode(result, SystemConstant.CHARSET_NAME);
@@ -131,7 +130,7 @@ public class OpenApiController {
     @ApiOperation(value = "分析课程（试卷）创建/更新接口")
     @ApiResponses({@ApiResponse(code = 200, message = "分析课程（试卷）创建/更新接口", response = Object.class)})
     @RequestMapping(value = "/course_edit", method = RequestMethod.POST)
-    @Aac(auth = BOOL.FALSE)
+    @Aac(auth = false)
     @Transactional
     public Result courseEdit(@ApiParam(value = "接收分析课程（试卷）数据信息", required = true) @RequestBody String result) throws IOException {
         Optional.ofNullable(result).orElseThrow(() -> ExceptionResultEnum.PARAMS_ERROR.exception("数据为空"));
@@ -163,7 +162,7 @@ public class OpenApiController {
     @ApiOperation(value = "生成课程（试卷）分析报告接口")
     @ApiResponses({@ApiResponse(code = 200, message = "生成课程（试卷）分析报告接口", response = Object.class)})
     @RequestMapping(value = "/calculate", method = RequestMethod.POST)
-    @Aac(auth = BOOL.FALSE)
+    @Aac(auth = false)
     public Result calculate(@ApiParam(value = "接收分析课程（试卷）数据信息", required = true) @RequestBody String result) throws IOException {
         Optional.ofNullable(result).orElseThrow(() -> ExceptionResultEnum.PARAMS_ERROR.exception("数据为空"));
         String decodeJson = URLDecoder.decode(result, SystemConstant.CHARSET_NAME);
@@ -184,7 +183,7 @@ public class OpenApiController {
     @ApiOperation(value = "发布报告接口")
     @ApiResponses({@ApiResponse(code = 200, message = "发布报告接口", response = Object.class)})
     @RequestMapping(value = "/publish", method = RequestMethod.POST)
-    @Aac(auth = BOOL.FALSE)
+    @Aac(auth = false)
     public Result publish(@ApiParam(value = "发布报告接口", required = true) @RequestBody String result) throws IOException {
         Optional.ofNullable(result).orElseThrow(() -> ExceptionResultEnum.PARAMS_ERROR.exception("数据为空"));
         String decodeJson = URLDecoder.decode(result, SystemConstant.CHARSET_NAME);

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

@@ -2,7 +2,6 @@ package com.qmth.teachcloud.report.api;
 
 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 com.qmth.teachcloud.common.SignatureEntityTest;
 import com.qmth.teachcloud.common.bean.dto.UserAuthenticationDto;
@@ -77,7 +76,7 @@ public class SsoApiController {
     @ApiOperation(value = "单点登录接口")
     @ApiResponses({@ApiResponse(code = 200, message = "单点登录接口", response = Object.class)})
     @RequestMapping(value = "/login", method = RequestMethod.POST)
-    @Aac(auth = BOOL.FALSE)
+    @Aac(auth = false)
     @Transactional
     public void login(@ApiParam(value = "登录名", required = true) @RequestParam String loginName,
                       @ApiParam(value = "角色", required = true) @RequestParam RoleTypeEnum role,
@@ -161,7 +160,7 @@ public class SsoApiController {
     @ApiOperation(value = "用户临时授权登录接口")
     @RequestMapping(value = "/user/authentication/login", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "返回消息", response = LoginResult.class)})
-    @Aac(auth = BOOL.FALSE)
+    @Aac(auth = false)
     public Result login(@ApiParam(value = "授权码信息", required = true) @RequestParam String code,
                         @ApiParam(value = "应用来源", required = true) @RequestParam AppSourceEnum appSource) throws NoSuchAlgorithmException, UnsupportedEncodingException {
         String[] values = StringUtils.split(URLDecoder.decode(code, SystemConstant.CHARSET_NAME), SignatureEntityTest.FIELD_JOINER);
@@ -193,7 +192,7 @@ public class SsoApiController {
     @ApiOperation(value = "用户鉴权退出接口")
     @RequestMapping(value = "/user/authentication/logout", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "返回消息", response = Result.class)})
-    @Aac(auth = BOOL.FALSE)
+    @Aac(auth = false)
     public void logout(@ApiParam(value = "时间戳", required = true) @RequestParam Long time,
                        @ApiParam(value = "鉴权", required = true) @RequestParam String authorization) throws IOException {
         TBSession tbSession = AuthThirdUtil.hasPermissionLogout(time, authorization);

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

@@ -2,7 +2,6 @@ package com.qmth.teachcloud.report.api;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qmth.boot.api.annotation.Aac;
-import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.util.Result;
@@ -49,7 +48,7 @@ public class StudentReportController {
     @ApiOperation(value = "学生报告-个人成绩总览接口")
     @RequestMapping(value = "/report/result", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "考生信息", response = TBExamStudentResult.class)})
-    @Aac(auth = BOOL.FALSE)
+    @Aac(auth = false)
     public Result reportResult(@ApiParam(value = "学校id", required = false) @RequestParam(required = false) String schoolId,
                                @ApiParam(value = "学号", required = true) @RequestParam String studentCode) {
         studentCode = EncrypAES.decrypt(studentCode);
@@ -59,7 +58,7 @@ public class StudentReportController {
     @ApiOperation(value = "学生报告接口")
     @RequestMapping(value = "/report/mark", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "考生信息", response = TBExamStudentResult.class)})
-    @Aac(auth = BOOL.FALSE)
+    @Aac(auth = false)
     public Result reportMark(@ApiParam(value = "学校id", required = false) @RequestParam(required = false) String schoolId,
                              @ApiParam(value = "学号", required = true) @RequestParam String studentCode,
                              @ApiParam(value = "考试id", required = true) @RequestParam String examId,

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

@@ -2,7 +2,6 @@ package com.qmth.teachcloud.report.api;
 
 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 com.qmth.boot.api.exception.ApiException;
 import com.qmth.teachcloud.common.bean.auth.AuthBean;
@@ -87,7 +86,7 @@ public class SysController {
     @ApiOperation(value = "登录")
     @RequestMapping(value = "/login", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "用户信息", response = LoginResult.class)})
-    @Aac(auth = BOOL.FALSE)
+    @Aac(auth = false)
     public Result login(@ApiParam(value = "用户信息", required = true) @Valid @RequestBody LoginParam login, BindingResult bindingResult) throws NoSuchAlgorithmException {
         if (bindingResult.hasErrors()) {
             return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
@@ -188,7 +187,7 @@ public class SysController {
      */
     @ApiOperation(value = "发送验证码")
     @RequestMapping(value = "/get_verify_code", method = RequestMethod.POST)
-    @Aac(auth = BOOL.FALSE)
+    @Aac(auth = false)
     public Object getverifyCode(@RequestBody LoginParam loginParam) {
         String loginName = loginParam.getLoginName();
         String password = loginParam.getPassword();
@@ -220,7 +219,7 @@ public class SysController {
     @ApiOperation(value = "根据机构代码查询机构信息接口")
     @RequestMapping(value = "/school/query_by_school_code", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "学校信息", response = EditResult.class)})
-    @Aac(auth = BOOL.FALSE)
+    @Aac(auth = false)
     public Result queryBySchoolCode(@ApiParam(value = "机构code", required = true) @RequestParam String code) {
         if (Objects.nonNull(code) && code.contains("#")) {
             code = code.substring(0, code.indexOf("#"));
@@ -315,7 +314,7 @@ public class SysController {
 
     @ApiOperation(value = "获取服务器时间")
     @RequestMapping(value = "/get_system_time", method = RequestMethod.POST)
-    @Aac(auth = BOOL.FALSE)
+    @Aac(auth = false)
     public Result getSystemTime() {
         return ResultUtil.ok(System.currentTimeMillis());
     }

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

@@ -1,7 +1,6 @@
 package com.qmth.teachcloud.report.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.teachcloud.common.bean.params.UserSaveReportParams;
 import com.qmth.teachcloud.common.contant.SystemConstant;
@@ -138,7 +137,7 @@ public class SysUserController {
      */
     @ApiOperation(value = "修改密码")
     @RequestMapping(value = "/update_password", method = RequestMethod.POST)
-    @Aac(strict = BOOL.FALSE, auth = BOOL.FALSE)
+    @Aac(strict = false, auth = false)
     public Result updatePassword(@RequestBody SysUser user) throws NoSuchAlgorithmException {
         return ResultUtil.ok(sysUserService.updatePassword(user));
     }

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

@@ -3,7 +3,6 @@ package com.qmth.teachcloud.report.api;
 import com.alibaba.fastjson.JSON;
 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 com.qmth.teachcloud.common.SignatureEntityTest;
 import com.qmth.teachcloud.common.bean.dto.UserAuthenticationDto;
@@ -72,7 +71,7 @@ public class WudaOpenApiController {
     @ApiOperation(value = "cas鉴权接口")
     @RequestMapping(value = "/authentication", method = RequestMethod.GET)
     @ApiResponses({@ApiResponse(code = 200, message = "返回消息", response = Result.class)})
-    @Aac(auth = BOOL.FALSE)
+    @Aac(auth = false)
     public void authentication(HttpServletRequest request, HttpServletResponse response) throws IOException {
         log.info("student request.getRemoteUser():{}", JacksonUtil.parseJson(request.getRemoteUser()));
         String uid = request.getRemoteUser();
@@ -105,7 +104,7 @@ public class WudaOpenApiController {
     @ApiOperation(value = "cas用户鉴权退出接口")
     @RequestMapping(value = "/user/authentication/logout", method = RequestMethod.GET)
     @ApiResponses({@ApiResponse(code = 200, message = "返回消息", response = Result.class)})
-    @Aac(auth = BOOL.FALSE)
+    @Aac(auth = false)
     public void authenticationLogout() throws IOException {
         reportCommonService.whuLogout();
     }
@@ -113,7 +112,7 @@ public class WudaOpenApiController {
     @ApiOperation(value = "cas用户鉴权接口")
     @RequestMapping(value = "/user/authentication", method = RequestMethod.GET)
     @ApiResponses({@ApiResponse(code = 200, message = "返回消息", response = Result.class)})
-    @Aac(auth = BOOL.FALSE)
+    @Aac(auth = false)
     public void userAuthentication(HttpServletRequest request, HttpServletResponse response) throws IOException {
         log.info("user request.getRemoteUser():{}", JacksonUtil.parseJson(request.getRemoteUser()));
         String uid = request.getRemoteUser();
@@ -169,7 +168,7 @@ public class WudaOpenApiController {
     @ApiOperation(value = "cas用户临时授权登录接口")
     @RequestMapping(value = "/user/authentication/login", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "返回消息", response = LoginResult.class)})
-    @Aac(auth = BOOL.FALSE)
+    @Aac(auth = false)
     public Result login(@ApiParam(value = "授权码信息", required = true) @RequestParam String code) throws NoSuchAlgorithmException, UnsupportedEncodingException {
         String[] values = StringUtils.split(URLDecoder.decode(code, SystemConstant.CHARSET_NAME), SignatureEntityTest.FIELD_JOINER);
         if (Objects.isNull(values) || values.length != 2) {

teachcloud-report/src/main/java/com/qmth/teachcloud/report/config/MapApiReader.java

@@ -1,7 +1,6 @@
 package com.qmth.teachcloud.report.config;
 
 import com.fasterxml.classmate.TypeResolver;
-import com.google.common.base.Optional;
 import com.qmth.teachcloud.common.annotation.ApiJsonObject;
 import com.qmth.teachcloud.common.annotation.ApiJsonProperty;
 import com.qmth.teachcloud.common.contant.SystemConstant;
@@ -23,6 +22,7 @@ import springfox.documentation.spi.service.ParameterBuilderPlugin;
 import springfox.documentation.spi.service.contexts.ParameterContext;
 
 import java.util.Map;
+import java.util.Optional;
 
 /**
  * @Description: swagger2 map参数说明插件

teachcloud-report/src/main/java/com/qmth/teachcloud/report/config/SwaggerConfig.java

@@ -1,6 +1,5 @@
 package com.qmth.teachcloud.report.config;
 
-import com.google.common.base.Predicates;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -12,7 +11,7 @@ import springfox.documentation.service.ApiInfo;
 import springfox.documentation.service.Parameter;
 import springfox.documentation.spi.DocumentationType;
 import springfox.documentation.spring.web.plugins.Docket;
-import springfox.documentation.swagger2.annotations.EnableSwagger2;
+import springfox.documentation.swagger2.annotations.EnableSwagger2WebMvc;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -25,7 +24,7 @@ import java.util.List;
  * @Date: 2019/9/21
  */
 @Configuration
-@EnableSwagger2
+@EnableSwagger2WebMvc
 public class SwaggerConfig {
 
     @Bean
@@ -51,7 +50,7 @@ public class SwaggerConfig {
 //                .apis(RequestHandlerSelectors.any())
                 .paths(PathSelectors.any())
                 // 不显示错误的接口地址
-                .paths(Predicates.not(PathSelectors.regex("/error.*")))// 错误路径不监控
+//                .paths(Predicates.not(PathSelectors.regex("/error.*")))// 错误路径不监控
                 .build()
                 .globalOperationParameters(pars)
                 .apiInfo(apiInfo());