add:第九次教研分析

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

@@ -23,7 +23,7 @@ import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.SysConfig;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
-import com.qmth.teachcloud.common.service.CacheService;
+import com.qmth.teachcloud.common.service.CommonCacheService;
 import com.qmth.teachcloud.common.service.SysConfigService;
 import com.qmth.teachcloud.common.util.ServletUtil;
 import org.apache.commons.lang3.StringUtils;
@@ -46,7 +46,7 @@ public class BasicMessageServiceImpl extends ServiceImpl<BasicMessageMapper, Bas
     @Resource
     private DictionaryConfig dictionaryConfig;
     @Resource
-    private CacheService cacheService;
+    private CommonCacheService commonCacheService;
 
     @Transactional(rollbackFor = Exception.class)
     @Override
@@ -166,7 +166,7 @@ public class BasicMessageServiceImpl extends ServiceImpl<BasicMessageMapper, Bas
                 String paperNumber = examTask.getPaperNumber();
                 // 获取短信接收对象的信息
                 Long userId = examTask.getUserId();
-                SysUser user = cacheService.userCache(userId);
+                SysUser user = commonCacheService.userCache(userId);
                 if (Objects.nonNull(user)) {
                     String userName = user.getRealName();
                     String mobileNumber = user.getMobileNumber();
@@ -196,7 +196,7 @@ public class BasicMessageServiceImpl extends ServiceImpl<BasicMessageMapper, Bas
         for (Map.Entry<Long, List<String>> longListEntry : collects.entrySet()) {
             Long userId = longListEntry.getKey();
             List<String> ids = longListEntry.getValue();
-            SysUser user = cacheService.userCache(userId);
+            SysUser user = commonCacheService.userCache(userId);
             if (Objects.nonNull(user)) {
                 String userName = user.getRealName();
                 String mobileNumber = user.getMobileNumber();
@@ -216,7 +216,7 @@ public class BasicMessageServiceImpl extends ServiceImpl<BasicMessageMapper, Bas
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         // 考务老师(命题任务创建人)
         Long userId = examTask.getCreateId();
-        SysUser user = cacheService.userCache(userId);
+        SysUser user = commonCacheService.userCache(userId);
         if (Objects.nonNull(user)) {
             String userName = user.getRealName();
             String mobileNumber = user.getMobileNumber();
@@ -234,7 +234,7 @@ public class BasicMessageServiceImpl extends ServiceImpl<BasicMessageMapper, Bas
     @Override
     public void sendNoticeExpireOrOverdue(MessageEnum messageType, Long userId, List<String> ids) {
         // 考务老师(命题任务创建人)
-        SysUser user = cacheService.userCache(userId);
+        SysUser user = commonCacheService.userCache(userId);
         if (Objects.nonNull(user)) {
             String userName = user.getRealName();
             String mobileNumber = user.getMobileNumber();

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

@@ -18,7 +18,7 @@ import com.qmth.teachcloud.common.entity.BasicSchool;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.enums.TaskResultEnum;
 import com.qmth.teachcloud.common.enums.TaskStatusEnum;
-import com.qmth.teachcloud.common.service.CacheService;
+import com.qmth.teachcloud.common.service.CommonCacheService;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -47,7 +47,7 @@ public class DataSyncServiceImpl implements DataSyncService {
     private DictionaryConfig dictionaryConfig;
 
     @Autowired
-    private CacheService cacheService;
+    private CommonCacheService commonCacheService;
 
     @Autowired
     private ExamStudentService examStudentService;
@@ -323,7 +323,7 @@ public class DataSyncServiceImpl implements DataSyncService {
      * @return
      */
     private String createSign(Long schoolId, long time, String url) {
-        BasicSchool basicSchool = cacheService.schoolCache(schoolId);
+        BasicSchool basicSchool = commonCacheService.schoolCache(schoolId);
         if (basicSchool == null) {
             throw ExceptionResultEnum.ERROR.exception("学校不存在");
         } else {

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

@@ -25,7 +25,7 @@ import com.qmth.teachcloud.common.entity.TBTask;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.enums.TaskTypeEnum;
 import com.qmth.teachcloud.common.service.BasicAttachmentService;
-import com.qmth.teachcloud.common.service.CacheService;
+import com.qmth.teachcloud.common.service.CommonCacheService;
 import com.qmth.teachcloud.common.service.TBTaskService;
 import com.qmth.teachcloud.common.service.TeachcloudCommonService;
 import com.qmth.teachcloud.common.util.ConvertUtil;
@@ -66,7 +66,7 @@ public class ExamDetailServiceImpl extends ServiceImpl<ExamDetailMapper, ExamDet
     @Resource
     private ExamDetailMapper examDetailMapper;
     @Resource
-    private CacheService cacheService;
+    private CommonCacheService commonCacheService;
     @Resource
     private ExamStudentService examStudentService;
     @Resource
@@ -196,7 +196,7 @@ public class ExamDetailServiceImpl extends ServiceImpl<ExamDetailMapper, ExamDet
         String fileName = "考务数据模板";
         response.setHeader("Content-Disposition", "inline;filename=" + URLEncoder.encode(fileName, SystemConstant.CHARSET_NAME) + DEFALUT_EXT);
         response.setContentType(DEFALUT_CONTENT_TYPE);
-        XSSFSheet sheet = wb.createSheet(cacheService.schoolCache(schoolId).getName() + "考务数据模板");
+        XSSFSheet sheet = wb.createSheet(commonCacheService.schoolCache(schoolId).getName() + "考务数据模板");
 
         XSSFFont font = wb.createFont();
         font.setFontHeightInPoints((short) 11);

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

@@ -101,7 +101,7 @@ public class TaskLogicServiceImpl implements TaskLogicService {
     OssUtil ossUtil;
 
     @Resource
-    CacheService cacheService;
+    CommonCacheService commonCacheService;
 
     @Resource
     BasicCourseService basicCourseService;
@@ -413,7 +413,7 @@ public class TaskLogicServiceImpl implements TaskLogicService {
                 throw ExceptionResultEnum.EXAM_PRINT_IS_NULL.exception();
             }
 
-            BasicSchool basicSchool = cacheService.schoolCache(examPrintPlan.getSchoolId());
+            BasicSchool basicSchool = commonCacheService.schoolCache(examPrintPlan.getSchoolId());
             BasicExamRule basicExamRule = basicExamRuleService.getBySchoolId(schoolId);
             if (Objects.isNull(basicExamRule)) {
                 throw ExceptionResultEnum.EXAM_RULE_IS_NULL.exception();
@@ -953,7 +953,7 @@ public class TaskLogicServiceImpl implements TaskLogicService {
     public Map<String, Object> executeExportPaperAndCardLogic(Map<String, Object> map) throws IOException {
         TBTask tbTask = (TBTask) map.get(SystemConstant.TASK);
         String yyyyMMddHH24mmss = DateUtil.format(new Date(), "yyyyMMddHHmmss");
-        BasicSchool basicSchool = cacheService.schoolCache(tbTask.getSchoolId());
+        BasicSchool basicSchool = commonCacheService.schoolCache(tbTask.getSchoolId());
         LocalDateTime nowTime = LocalDateTime.now();
         StringJoiner zipJoiner = new StringJoiner("")
                 .add(SystemConstant.TEMP_FILES_DIR).add(File.separator);

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

@@ -1,9 +1,6 @@
 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.CardRuleDto;
 import com.qmth.distributed.print.business.entity.BasicCardRule;

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

@@ -3,7 +3,6 @@ package com.qmth.distributed.print.api;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.*;
 import com.qmth.distributed.print.business.bean.params.ClientLoginParam;
@@ -15,7 +14,7 @@ import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.enums.AppSourceEnum;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.enums.RoleTypeEnum;
-import com.qmth.teachcloud.common.service.CacheService;
+import com.qmth.teachcloud.common.service.CommonCacheService;
 import com.qmth.teachcloud.common.service.SysUserService;
 import com.qmth.teachcloud.common.service.TeachcloudCommonService;
 import com.qmth.teachcloud.common.util.Result;
@@ -50,7 +49,7 @@ public class ClientController {
     SysUserService sysUserService;
 
     @Resource
-    CacheService cacheService;
+    CommonCacheService commonCacheService;
 
     @Resource
     TeachcloudCommonService teachcloudCommonService;
@@ -64,13 +63,13 @@ public class ClientController {
     @ApiOperation(value = "登录")
     @RequestMapping(value = "/user/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 ClientLoginParam login, BindingResult bindingResult) throws NoSuchAlgorithmException {
         if (bindingResult.hasErrors()) {
             return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
         }
 
-        BasicSchool basicSchool = cacheService.schoolCache(login.getSchoolCode());
+        BasicSchool basicSchool = commonCacheService.schoolCache(login.getSchoolCode());
         if (Objects.isNull(basicSchool)) {
             throw ExceptionResultEnum.SCHOOL_NO_DATA.exception();
         }

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

@@ -2,7 +2,6 @@ package com.qmth.distributed.print.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.distributed.print.business.bean.params.LoginParam;
@@ -12,7 +11,6 @@ import com.qmth.distributed.print.business.service.BasicVerifyCodeService;
 import com.qmth.distributed.print.business.service.PrintCommonService;
 import com.qmth.teachcloud.common.bean.auth.AuthBean;
 import com.qmth.teachcloud.common.bean.dto.MenuDto;
-import com.qmth.teachcloud.common.bean.dto.SchoolDto;
 import com.qmth.teachcloud.common.bean.result.LoginResult;
 import com.qmth.teachcloud.common.config.DictionaryConfig;
 import com.qmth.teachcloud.common.contant.SystemConstant;
@@ -58,7 +56,7 @@ public class SysController {
     private DictionaryConfig dictionaryConfig;
 
     @Resource
-    CacheService cacheService;
+    CommonCacheService commonCacheService;
 
     @Resource
     TBSessionService tbSessionService;
@@ -96,7 +94,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());
@@ -104,7 +102,7 @@ public class SysController {
 
         BasicSchool basicSchool = null;
         if (!Objects.equals(login.getSchoolCode().toUpperCase(), RoleTypeEnum.ADMIN.name())) {
-            basicSchool = cacheService.schoolCache(login.getSchoolCode());
+            basicSchool = commonCacheService.schoolCache(login.getSchoolCode());
             if (Objects.isNull(basicSchool)) {
                 throw ExceptionResultEnum.SCHOOL_NO_DATA.exception();
             }
@@ -174,14 +172,14 @@ public class SysController {
     public Result logout() {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         TBSession tbSession = (TBSession) ServletUtil.getRequestSession();
-        AuthBean authBean = cacheService.userAuthCache(sysUser.getId());
+        AuthBean authBean = commonCacheService.userAuthCache(sysUser.getId());
         if (Objects.isNull(authBean)) {
             throw ExceptionResultEnum.NOT_LOGIN.exception();
         }
         tbSessionService.removeById(tbSession.getId());
         redisUtil.deleteUserSession(tbSession.getId());
-        cacheService.removeUserCache(sysUser.getId());
-        cacheService.removeUserAuthCache(sysUser.getId());
+        commonCacheService.removeUserCache(sysUser.getId());
+        commonCacheService.removeUserAuthCache(sysUser.getId());
         return ResultUtil.ok(new EditResult(sysUser.getId()));
     }
 
@@ -193,13 +191,13 @@ 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();
         QueryWrapper<SysUser> wrapper = new QueryWrapper<>();
         if (StringUtils.isNotBlank(loginParam.getSchoolCode())) {
-            BasicSchool basicSchool = cacheService.schoolCache(loginParam.getSchoolCode());
+            BasicSchool basicSchool = commonCacheService.schoolCache(loginParam.getSchoolCode());
             wrapper.lambda().eq(SysUser::getSchoolId, basicSchool.getId());
         }
         wrapper.lambda().eq(SysUser::getLoginName, loginName);
@@ -222,10 +220,10 @@ 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.equals(code.toUpperCase(), RoleTypeEnum.ADMIN.name())) {
-            BasicSchool basicSchool = cacheService.schoolCache(code);
+            BasicSchool basicSchool = commonCacheService.schoolCache(code);
             if (Objects.isNull(basicSchool)) {
                 throw ExceptionResultEnum.SCHOOL_NO_DATA.exception();
             }

distributed-print/src/main/java/com/qmth/distributed/print/auth/DistributedPrintAuthenticationService.java

@@ -12,7 +12,7 @@ import com.qmth.teachcloud.common.entity.TBSession;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.enums.PrivilegePropertyEnum;
 import com.qmth.teachcloud.common.enums.RoleTypeEnum;
-import com.qmth.teachcloud.common.service.CacheService;
+import com.qmth.teachcloud.common.service.CommonCacheService;
 import com.qmth.teachcloud.common.util.RedisUtil;
 import com.qmth.teachcloud.common.util.ServletUtil;
 import org.slf4j.Logger;
@@ -31,7 +31,7 @@ public class DistributedPrintAuthenticationService implements AuthorizationServi
     private final static Logger log = LoggerFactory.getLogger(DistributedPrintAuthenticationService.class);
 
     @Resource
-    CacheService cacheService;
+    CommonCacheService commonCacheService;
 
     @Resource
     RedisUtil redisUtil;
@@ -67,7 +67,7 @@ public class DistributedPrintAuthenticationService implements AuthorizationServi
                 throw ExceptionResultEnum.AUTHORIZATION_ERROR.exception();
             }
             Long userId = Long.parseLong(tbSession.getIdentity());
-            SysUser sysUser = cacheService.userCache(userId);
+            SysUser sysUser = commonCacheService.userCache(userId);
             HttpServletRequest request = ServletUtil.getRequest();
             HttpServletResponse response = ServletUtil.getResponse();
             request.setAttribute(SystemConstant.SESSION, tbSession);
@@ -105,7 +105,7 @@ public class DistributedPrintAuthenticationService implements AuthorizationServi
                                   HttpServletRequest request,
                                   HttpServletResponse response) {
         //验证权限
-        AuthBean authBean = type.contains(SystemConstant.USER_OAUTH_CACHE) ? authBean = cacheService.userAuthCache(userId) : null;
+        AuthBean authBean = type.contains(SystemConstant.USER_OAUTH_CACHE) ? authBean = commonCacheService.userAuthCache(userId) : null;
         if (Objects.isNull(authBean)) {
             throw ExceptionResultEnum.ROLE_ENABLE_AUTHORIZATION.exception();
         }
@@ -118,7 +118,7 @@ public class DistributedPrintAuthenticationService implements AuthorizationServi
             return true;
         }
         //系统公用接口不拦截
-        List<String> sysUrls = cacheService.privilegeUrlCache(PrivilegePropertyEnum.SYS);
+        List<String> sysUrls = commonCacheService.privilegeUrlCache(PrivilegePropertyEnum.SYS);
         int sysCount = Objects.nonNull(sysUrls) ? (int) sysUrls.stream().filter(s -> s.equalsIgnoreCase(path)).count() : 0;
         if (sysCount > 0) {
             return true;

pom.xml

@@ -22,7 +22,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
-        <qmth.boot.version>1.0.0</qmth.boot.version>
+        <qmth.boot.version>1.0.5</qmth.boot.version>
         <java.version>1.8</java.version>
         <swagger2.version>2.9.2</swagger2.version>
         <fastjson.version>1.2.68</fastjson.version>
@@ -32,7 +32,7 @@
         <guava.version>27.1-jre</guava.version>
         <hutool.version>5.0.6</hutool.version>
         <bcprov.version>1.52</bcprov.version>
-        <spring-boot.version>2.3.0.RELEASE</spring-boot.version>
+        <spring-boot.version>2.3.7.RELEASE</spring-boot.version>
         <gson.version>2.8.6</gson.version>
         <commons.version>3.10</commons.version>
         <commons.codec.version>1.15</commons.codec.version>
@@ -110,11 +110,11 @@
                 <artifactId>data-redis</artifactId>
                 <version>${qmth.boot.version}</version>
             </dependency>
-            <dependency>
-                <groupId>com.qmth.boot</groupId>
-                <artifactId>data-mysql-mp</artifactId>
-                <version>${qmth.boot.version}</version>
-            </dependency>
+<!--            <dependency>-->
+<!--                <groupId>com.qmth.boot</groupId>-->
+<!--                <artifactId>data-mysql-mp</artifactId>-->
+<!--                <version>${qmth.boot.version}</version>-->
+<!--            </dependency>-->
             <dependency>
                 <groupId>io.springfox</groupId>
                 <artifactId>springfox-swagger2</artifactId>
@@ -248,6 +248,16 @@
                 <artifactId>freemarker</artifactId>
                 <version>${freemarker.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.qmth.boot</groupId>
+                <artifactId>tools-poi</artifactId>
+                <version>${qmth.boot.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.qmth.boot</groupId>
+                <artifactId>data-mybatis-plus</artifactId>
+                <version>${qmth.boot.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

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

@@ -1,7 +1,6 @@
 package com.qmth.teachcloud.common.api.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.entity.SysConfig;
 import com.qmth.teachcloud.common.service.SysConfigService;
@@ -33,7 +32,7 @@ public class SysConfigController {
 
     @ApiOperation(value = "根据key查询")
     @RequestMapping(value = "/get_one", method = RequestMethod.POST)
-    @Aac(auth = BOOL.FALSE)
+    @Aac(auth = false)
     public Result getOne(@RequestParam(value = "key", required = false) String key) {
         SysConfig value = sysConfigService.getByKey(key);
         return ResultUtil.ok(value);

teachcloud-common/pom.xml

@@ -70,9 +70,13 @@
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-all</artifactId>
         </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.qmth.boot</groupId>-->
+<!--            <artifactId>data-mysql-mp</artifactId>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>com.qmth.boot</groupId>
-            <artifactId>data-mysql-mp</artifactId>
+            <artifactId>data-mybatis-plus</artifactId>
         </dependency>
         <dependency>
             <groupId>io.springfox</groupId>

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/CacheService.java → teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/CommonCacheService.java

@@ -13,7 +13,7 @@ import java.util.List;
  * @Author: wangliang
  * @Date: 2021/3/25
  */
-public interface CacheService {
+public interface CommonCacheService {
 
     /**
      * 添加用户缓存

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/CacheServiceImpl.java → teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/CommonCacheServiceImpl.java

@@ -24,8 +24,8 @@ import java.util.List;
  * @Date: 2021/3/25
  */
 @Service(value = "applicationCacheService")
-public class CacheServiceImpl implements CacheService {
-    private final static Logger log = LoggerFactory.getLogger(CacheServiceImpl.class);
+public class CommonCacheServiceImpl implements CommonCacheService {
+    private final static Logger log = LoggerFactory.getLogger(CommonCacheServiceImpl.class);
 
     @Resource
     SysUserService sysUserService;

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/SysRoleServiceImpl.java

@@ -11,7 +11,7 @@ import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.entity.SysUserRole;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.mapper.SysRoleMapper;
-import com.qmth.teachcloud.common.service.CacheService;
+import com.qmth.teachcloud.common.service.CommonCacheService;
 import com.qmth.teachcloud.common.service.SysRolePrivilegeService;
 import com.qmth.teachcloud.common.service.SysRoleService;
 import com.qmth.teachcloud.common.service.SysUserRoleService;
@@ -42,7 +42,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
     private SysRolePrivilegeService sysRolePrivilegeService;
 
     @Autowired
-    private CacheService cacheService;
+    private CommonCacheService commonCacheService;
 
     @Override
     public IPage<SysRole> list(String name, Boolean enable, Integer pageNumber, Integer pageSize) {
@@ -98,8 +98,8 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
         sysUserRoleService.rebindPrivileges(role.getId());
 
         // 清除缓存
-        cacheService.removeUserAuthCache(sysUser.getId());
-        cacheService.removeRolePrivilegeCache(role.getId());
+        commonCacheService.removeUserAuthCache(sysUser.getId());
+        commonCacheService.removeRolePrivilegeCache(role.getId());
 
         return isSuccess;
     }

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/SysUserServiceImpl.java

@@ -1,6 +1,5 @@
 package com.qmth.teachcloud.common.service.impl;
 
-import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -63,7 +62,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     private SysRolePrivilegeService sysRolePrivilegeService;
 
     @Autowired
-    CacheService cacheService;
+    CommonCacheService commonCacheService;
 
     @Autowired
     private TeachcloudCommonService commonService;
@@ -292,7 +291,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                     commonService.addUserRolePrivilege(sysUser, roleId);
                 }
             } else {//修改用户
-                List<SysUserRole> sysUserRoleList = cacheService.userRolePrivilegeCache(sysUser.getId());
+                List<SysUserRole> sysUserRoleList = commonCacheService.userRolePrivilegeCache(sysUser.getId());
                 List<Long> userRolesList = Arrays.asList(userSaveParams.getRoleIds());
                 Set<Long> dbUserRolesList = sysUserRoleList.stream().map(SysUserRole::getRoleId).collect(Collectors.toSet());
                 int count = (int) dbUserRolesList.stream().filter(s -> userRolesList.contains(s)).count();
@@ -306,7 +305,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                     sysUserRoleQueryWrapper.lambda().eq(SysUserRole::getUserId, sysUser.getId());
                     sysUserRoleService.remove(sysUserRoleQueryWrapper);
 
-                    cacheService.removeUserRolePrivilegeCache(sysUser.getId());
+                    commonCacheService.removeUserRolePrivilegeCache(sysUser.getId());
                     for (Long roleId : userSaveParams.getRoleIds()) {
                         commonService.addUserRolePrivilege(sysUser, roleId);
                     }
@@ -319,8 +318,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                 if (Objects.nonNull(dbUser.getOrgId())) {
                     if (containsQuestionTeacher || dbUser.getOrgId().longValue() != sysUser.getOrgId().longValue()
                             || !Objects.equals(dbUser.getMobileNumber(), sysUser.getMobileNumber())) {
-                        cacheService.updateUserCache(sysUser.getId());
-                        cacheService.updateUserAuthCache(sysUser.getId());
+                        commonCacheService.updateUserCache(sysUser.getId());
+                        commonCacheService.updateUserAuthCache(sysUser.getId());
                     }
                 }
             }
@@ -395,7 +394,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                     commonService.addUserRolePrivilege(sysUser, roleId);
                 }
             } else {//修改用户
-                List<SysUserRole> sysUserRoleList = cacheService.userRolePrivilegeCache(sysUser.getId());
+                List<SysUserRole> sysUserRoleList = commonCacheService.userRolePrivilegeCache(sysUser.getId());
                 List<Long> userRolesList = Arrays.asList(userSaveParams.getRoleIds());
                 Set<Long> dbUserRolesList = sysUserRoleList.stream().map(SysUserRole::getRoleId).collect(Collectors.toSet());
                 int count = (int) dbUserRolesList.stream().filter(s -> userRolesList.contains(s)).count();
@@ -409,7 +408,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                     sysUserRoleQueryWrapper.lambda().eq(SysUserRole::getUserId, sysUser.getId());
                     sysUserRoleService.remove(sysUserRoleQueryWrapper);
 
-                    cacheService.removeUserRolePrivilegeCache(sysUser.getId());
+                    commonCacheService.removeUserRolePrivilegeCache(sysUser.getId());
                     for (Long roleId : userSaveParams.getRoleIds()) {
                         commonService.addUserRolePrivilege(sysUser, roleId);
                     }
@@ -421,8 +420,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                 //如果修改了机构或手机号，需更新用户缓存
                 if (Objects.nonNull(dbUser.getOrgId())) {
                     if (containsQuestionTeacher || dbUser.getOrgId().longValue() != sysUser.getOrgId().longValue() || !Objects.equals(dbUser.getMobileNumber(), sysUser.getMobileNumber())) {
-                        cacheService.updateUserCache(sysUser.getId());
-                        cacheService.updateUserAuthCache(sysUser.getId());
+                        commonCacheService.updateUserCache(sysUser.getId());
+                        commonCacheService.updateUserAuthCache(sysUser.getId());
                     }
                 }
             }

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/TeachcloudCommonServiceImpl.java

@@ -49,7 +49,7 @@ public class TeachcloudCommonServiceImpl implements TeachcloudCommonService {
     private final static Logger log = LoggerFactory.getLogger(TeachcloudCommonServiceImpl.class);
 
     @Resource
-    CacheService cacheService;
+    CommonCacheService commonCacheService;
 
     @Resource
     SysUserRoleService sysUserRoleService;
@@ -95,7 +95,7 @@ public class TeachcloudCommonServiceImpl implements TeachcloudCommonService {
      */
     @Override
     public void addUserRolePrivilege(SysUser sysUser, Long roleId) {
-        List<SysRolePrivilege> sysRolePrivilegeList = cacheService.rolePrivilegeCache(roleId);
+        List<SysRolePrivilege> sysRolePrivilegeList = commonCacheService.rolePrivilegeCache(roleId);
         List<SysUserRole> sysUserRoleList = new ArrayList<>();
         sysRolePrivilegeList.forEach(s -> {
             sysUserRoleList.add(new SysUserRole(sysUser.getId(), s.getRoleId(), s.getPrivilegeId()));
@@ -140,13 +140,13 @@ public class TeachcloudCommonServiceImpl implements TeachcloudCommonService {
     public AuthBean getUserAuth(Long userId) {
         AuthBean authBean = null;
         try {
-            CacheService cacheService = SpringContextHolder.getBean(CacheService.class);
-            SysUser user = cacheService.userCache(userId);
+            CommonCacheService commonCacheService = SpringContextHolder.getBean(CommonCacheService.class);
+            SysUser user = commonCacheService.userCache(userId);
             if (Objects.isNull(user)) {
                 throw ExceptionResultEnum.USER_NO_DATA.exception();
             }
             //查询用户角色和权限
-            List<SysUserRole> sysUserRoleList = cacheService.userRolePrivilegeCache(user.getId());
+            List<SysUserRole> sysUserRoleList = commonCacheService.userRolePrivilegeCache(user.getId());
             if (Objects.nonNull(sysUserRoleList) && sysUserRoleList.size() > 0) {
                 Set<Long> roleIds = new HashSet<>();
                 Set<Long> privilegeIds = new HashSet<>();
@@ -166,8 +166,8 @@ public class TeachcloudCommonServiceImpl implements TeachcloudCommonService {
                     List<SysPrivilege> sysPrivilegeList = sysPrivilegeService.list(sysPrivilegeQueryWrapper);
                     authBean = new AuthBean(sysRoleList, sysPrivilegeList.stream().map(s -> s.getUrl()).collect(Collectors.toSet()));
                 } else {
-                    BasicSchool tbSchool = Objects.nonNull(user.getSchoolId()) ? cacheService.schoolCache(user.getSchoolId()) : null;
-                    SysOrg org = Objects.nonNull(user.getOrgId()) ? cacheService.orgCache(user.getOrgId()) : null;
+                    BasicSchool tbSchool = Objects.nonNull(user.getSchoolId()) ? commonCacheService.schoolCache(user.getSchoolId()) : null;
+                    SysOrg org = Objects.nonNull(user.getOrgId()) ? commonCacheService.orgCache(user.getOrgId()) : null;
                     sysPrivilegeQueryWrapper.lambda().in(SysPrivilege::getId, privilegeIds)
                             .eq(SysPrivilege::getProperty, PrivilegePropertyEnum.AUTH);
                     List<SysPrivilege> sysPrivilegeList = sysPrivilegeService.list(sysPrivilegeQueryWrapper);
@@ -204,7 +204,7 @@ public class TeachcloudCommonServiceImpl implements TeachcloudCommonService {
      */
     @Override
     public void removeUserInfo(Long userId) throws NoSuchAlgorithmException {
-        AuthBean authBean = cacheService.userAuthCache(userId);
+        AuthBean authBean = commonCacheService.userAuthCache(userId);
         if (Objects.isNull(authBean)) {
             throw ExceptionResultEnum.NOT_LOGIN.exception();
         }
@@ -213,8 +213,8 @@ public class TeachcloudCommonServiceImpl implements TeachcloudCommonService {
             tbSessionService.removeById(sessionId);
             redisUtil.deleteUserSession(sessionId);
         }
-        cacheService.removeUserCache(userId);
-        cacheService.removeUserAuthCache(userId);
+        commonCacheService.removeUserCache(userId);
+        commonCacheService.removeUserAuthCache(userId);
     }
 
     /**
@@ -256,7 +256,7 @@ public class TeachcloudCommonServiceImpl implements TeachcloudCommonService {
             //如果数据库的状态和修改的状态不同
             if (Objects.nonNull(dbRole.getEnable()) && dbRole.getEnable().booleanValue() != enable.booleanValue()) {
                 //更新角色权限
-                cacheService.updateRolePrivilegeCache(dbRole.getId());
+                commonCacheService.updateRolePrivilegeCache(dbRole.getId());
                 updateRoleIds.add(dbRole.getId());
             }
         }
@@ -266,8 +266,8 @@ public class TeachcloudCommonServiceImpl implements TeachcloudCommonService {
         List<SysUserRole> sysUserRoleList = sysUserRoleService.list(sysUserRoleQueryWrapper);
         Set<Long> userIds = sysUserRoleList.stream().map(s -> s.getUserId()).collect(Collectors.toSet());
         for (Long l : userIds) {
-            cacheService.updateUserRolePrivilegeCache(l);
-            cacheService.updateUserAuthCache(l);
+            commonCacheService.updateUserRolePrivilegeCache(l);
+            commonCacheService.updateUserAuthCache(l);
         }
     }
 
@@ -634,7 +634,7 @@ public class TeachcloudCommonServiceImpl implements TeachcloudCommonService {
         }
         //生成token
         String token = SystemConstant.getUuid();
-        cacheService.userCache(sysUser.getId());
+        commonCacheService.userCache(sysUser.getId());
         //添加用户会话缓存
         Set<RoleTypeEnum> roleType = authBean.getRoleList().stream().map(SysRole::getType).collect(Collectors.toSet());
         String sessionId = SessionUtil.digest(sysUser.getId(), Math.abs(roleType.toString().hashCode()), platform.name());

teachcloud-common/src/main/java/com/qmth/teachcloud/common/util/AuthUtil.java

@@ -12,7 +12,7 @@ import com.qmth.teachcloud.common.entity.TBSession;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.enums.PrivilegePropertyEnum;
 import com.qmth.teachcloud.common.enums.RoleTypeEnum;
-import com.qmth.teachcloud.common.service.CacheService;
+import com.qmth.teachcloud.common.service.CommonCacheService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -30,7 +30,7 @@ import java.util.*;
 public class AuthUtil {
     private final static Logger log = LoggerFactory.getLogger(AuthUtil.class);
 
-    static CacheService cacheService = null;
+    static CommonCacheService commonCacheService = null;
 
     /**
      * admin鉴权
@@ -41,8 +41,8 @@ public class AuthUtil {
      */
     public static boolean adminAuthInterceptor(HttpServletRequest request, HttpServletResponse response) {
         String url = request.getServletPath();
-        cacheService = SpringContextHolder.getBean(CacheService.class);
-        List<String> privilegeUrl = cacheService.privilegeUrlCache(PrivilegePropertyEnum.NO_AUTH);
+        commonCacheService = SpringContextHolder.getBean(CommonCacheService.class);
+        List<String> privilegeUrl = commonCacheService.privilegeUrlCache(PrivilegePropertyEnum.NO_AUTH);
         //无需鉴权的url
         int noAuthCount = Objects.nonNull(privilegeUrl) ? (int) privilegeUrl.stream().filter(s -> s.equalsIgnoreCase(url)).count() : 0;
         if (noAuthCount > 0) {
@@ -61,7 +61,7 @@ public class AuthUtil {
 
         TBSession tbSession = authHeadCommon(platform, deviceId, authorization, time, method, url);
         Long userId = Long.parseLong(tbSession.getIdentity());
-        SysUser sysUser = cacheService.userCache(userId);
+        SysUser sysUser = commonCacheService.userCache(userId);
         request.setAttribute(SystemConstant.SESSION, tbSession);
         request.setAttribute(SystemConstant.USER, sysUser);
         return authFootCommon(userId, SystemConstant.USER_OAUTH_CACHE, request, response);
@@ -140,7 +140,7 @@ public class AuthUtil {
                                   HttpServletResponse response) {
         String url = request.getServletPath();
         //验证权限
-        AuthBean authBean = type.contains(SystemConstant.USER_OAUTH_CACHE) ? authBean = cacheService.userAuthCache(userId) : null;
+        AuthBean authBean = type.contains(SystemConstant.USER_OAUTH_CACHE) ? authBean = commonCacheService.userAuthCache(userId) : null;
         if (Objects.isNull(authBean)) {
             throw ExceptionResultEnum.ROLE_ENABLE_AUTHORIZATION.exception();
         }
@@ -153,7 +153,7 @@ public class AuthUtil {
             return true;
         }
         //系统公用接口不拦截
-        List<String> sysUrls = cacheService.privilegeUrlCache(PrivilegePropertyEnum.SYS);
+        List<String> sysUrls = commonCacheService.privilegeUrlCache(PrivilegePropertyEnum.SYS);
         int sysCount = Objects.nonNull(sysUrls) ? (int) sysUrls.stream().filter(s -> s.equalsIgnoreCase(url)).count() : 0;
         if (sysCount > 0) {
             return true;

teachcloud-report-business/pom.xml

@@ -55,9 +55,13 @@
 			<groupId>com.aliyun.oss</groupId>
 			<artifactId>aliyun-sdk-oss</artifactId>
 		</dependency>
+<!--		<dependency>-->
+<!--			<groupId>com.qmth.boot</groupId>-->
+<!--			<artifactId>data-mysql-mp</artifactId>-->
+<!--		</dependency>-->
 		<dependency>
 			<groupId>com.qmth.boot</groupId>
-			<artifactId>data-mysql-mp</artifactId>
+			<artifactId>data-mybatis-plus</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>io.springfox</groupId>

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/enums/SemesterEnum.java

@@ -11,32 +11,40 @@ import java.util.Objects;
  */
 public enum SemesterEnum {
 
-    FIRST("2020-2021学年度第1学期"),
+    FIRST("2020-2021学年度第1学期", 9),
 
-    SECOND("2020-2021学年度第2学期"),
+    SECOND("2020-2021学年度第2学期", 8),
 
-    THIRD("2021-2022学年度第1学期"),
+    THIRD("2021-2022学年度第1学期", 7),
 
-    FOURTH("2021-2022学年度第2学期"),
+    FOURTH("2021-2022学年度第2学期", 6),
 
-    FIFTH("2022-2023学年度第1学期"),
+    FIFTH("2022-2023学年度第1学期", 5),
 
-    SIXTH("2022-2023学年度第2学期"),
+    SIXTH("2022-2023学年度第2学期", 4),
 
-    SEVENTH("2023-2024学年度第1学期"),
+    SEVENTH("2023-2024学年度第1学期", 3),
 
-    EIGHTH("2023-2024学年度第2学期");
+    EIGHTH("2023-2024学年度第2学期", 2),
+
+    NINTH("2024-2025学年度第1学期", 1);
 
     private final String title;
+    private final Integer index;
 
-    private SemesterEnum(String title) {
+    private SemesterEnum(String title, Integer index) {
         this.title = title;
+        this.index = index;
     }
 
     public String getTitle() {
         return title;
     }
 
+    public Integer getIndex() {
+        return index;
+    }
+
     /**
      * 状态转换 toName
      *

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/service/impl/TBExamCourseServiceImpl.java

@@ -9,7 +9,7 @@ import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.enums.RoleTypeEnum;
 import com.qmth.teachcloud.common.service.BasicCourseService;
-import com.qmth.teachcloud.common.service.CacheService;
+import com.qmth.teachcloud.common.service.CommonCacheService;
 import com.qmth.teachcloud.common.service.SysOrgService;
 import com.qmth.teachcloud.common.util.ServletUtil;
 import com.qmth.teachcloud.report.business.bean.result.TBExamCourseResult;
@@ -54,7 +54,7 @@ public class TBExamCourseServiceImpl extends ServiceImpl<TBExamCourseMapper, TBE
     TBExaminationRelationService tbExaminationRelationService;
 
     @Resource
-    CacheService cacheService;
+    CommonCacheService commonCacheService;
 
     @Override
     public boolean verifyExamCourseCantRun(Long examId, Long schoolId, String courseCode, String courseName) {
@@ -154,7 +154,7 @@ public class TBExamCourseServiceImpl extends ServiceImpl<TBExamCourseMapper, TBE
     public List<TBExamCourseResult> findCourseList(Long schoolId, Long examId, boolean inspect, Boolean absent, Boolean current, PublishStatusEnum status) {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         List<Long> collegeIds = sysOrgService.findCollegeIds(sysUser.getOrgId());
-        AuthBean authBean = cacheService.userAuthCache(sysUser.getId());
+        AuthBean authBean = commonCacheService.userAuthCache(sysUser.getId());
         //院长开课学院不过滤，学校管理员不过滤，(院长考查学院过滤，教务老师过滤)
         boolean filter = true;
         if (Objects.nonNull(authBean) && Objects.nonNull(authBean.getRoleList()) && authBean.getRoleList().get(0).getType() == RoleTypeEnum.SCHOOL_ADMIN) {

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/service/impl/TBExamStudentServiceImpl.java

@@ -10,14 +10,12 @@ import com.google.common.collect.Lists;
 import com.qmth.teachcloud.common.bean.auth.AuthBean;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.BasicCourse;
-import com.qmth.teachcloud.common.entity.SysRole;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.enums.RoleTypeEnum;
 import com.qmth.teachcloud.common.service.BasicCourseService;
-import com.qmth.teachcloud.common.service.CacheService;
+import com.qmth.teachcloud.common.service.CommonCacheService;
 import com.qmth.teachcloud.common.service.SysOrgService;
-import com.qmth.teachcloud.common.service.SysRoleService;
 import com.qmth.teachcloud.common.util.ExcelUtil;
 import com.qmth.teachcloud.common.util.ServletUtil;
 import com.qmth.teachcloud.common.util.excel.ExcelError;
@@ -33,7 +31,6 @@ import com.qmth.teachcloud.report.business.service.TAExamCourseRecordDioService;
 import com.qmth.teachcloud.report.business.service.TBExamStudentService;
 import com.qmth.teachcloud.report.business.utils.EncrypAES;
 import org.apache.commons.lang3.StringUtils;
-import org.checkerframework.checker.units.qual.A;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -94,7 +91,7 @@ public class TBExamStudentServiceImpl extends ServiceImpl<TBExamStudentMapper, T
     SysOrgService sysOrgService;
 
     @Resource
-    CacheService cacheService;
+    CommonCacheService commonCacheService;
 
     @Resource
     TAExamCourseRecordDioService taExamCourseRecordDioService;
@@ -131,7 +128,7 @@ public class TBExamStudentServiceImpl extends ServiceImpl<TBExamStudentMapper, T
     @Override
     public List<TBExamStudentResult> selectInspectCollegeList(Long schoolId, Long examId, String courseCode, Boolean absent, Boolean current, PublishStatusEnum status) {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-        AuthBean authBean = cacheService.userAuthCache(sysUser.getId());
+        AuthBean authBean = commonCacheService.userAuthCache(sysUser.getId());
         if (Objects.nonNull(authBean) && Objects.nonNull(authBean.getRoleList()) && authBean.getRoleList().get(0).getType() == RoleTypeEnum.TEACHER) {
             List<Long> collegeIds = sysOrgService.findCollegeIds(sysUser.getOrgId());
             if (Objects.nonNull(collegeIds) && collegeIds.size() > 0) {

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/templete/execute/AsyncDataCalculateTempleteService.java

@@ -5,7 +5,7 @@ import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.TBTask;
 import com.qmth.teachcloud.common.enums.TaskResultEnum;
 import com.qmth.teachcloud.common.enums.TaskStatusEnum;
-import com.qmth.teachcloud.common.service.CacheService;
+import com.qmth.teachcloud.common.service.CommonCacheService;
 import com.qmth.teachcloud.common.service.TBTaskService;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
@@ -36,7 +36,7 @@ public class AsyncDataCalculateTempleteService extends AsyncCalculateTaskTemplet
     @Resource
     private AnalyzeForReportService analyzeForReportService;
     @Resource
-    private CacheService cacheService;
+    private CommonCacheService commonCacheService;
     @Resource
     private TBExamCourseService tbExamCourseService;
 
@@ -72,10 +72,10 @@ public class AsyncDataCalculateTempleteService extends AsyncCalculateTaskTemplet
             tbTask.setStatus(TaskStatusEnum.FINISH);
             tbTaskService.updateById(tbTask);
             if (Objects.isNull(exception)){
-                cacheService.removeExamStudentReportCache();
-                cacheService.removeCollegeDeanCache();
-                cacheService.removeCollegeCourseCache();
-                cacheService.removeSurveyTeacherViewCache();
+                commonCacheService.removeExamStudentReportCache();
+                commonCacheService.removeCollegeDeanCache();
+                commonCacheService.removeCollegeCourseCache();
+                commonCacheService.removeSurveyTeacherViewCache();
             }
         }
         return ResultUtil.ok(map);

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;
@@ -57,7 +56,7 @@ import java.util.stream.Stream;
 @Api(tags = "数据源处理controller")
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.datasource}")
-//@Aac(strict = BOOL.FALSE, auth = BOOL.FALSE)
+//@Aac(strict = false, auth = false)
 public class BasicDatasourceController {
     @Resource
     private TBPaperService tbPaperService;
@@ -1084,37 +1083,48 @@ public class BasicDatasourceController {
         if (tbExamCourseService.verifyExamCourseCantRun(SystemConstant.convertIdToLong(examId), SystemConstant.convertIdToLong(schoolId), courseCode, courseName)) {
             throw ExceptionResultEnum.ERROR.exception("课程编号[" + courseCode + "]的课程分析数据已测试或发布，不能变更基础数据");
         }
+        String courseNameTemp = courseName;
+        boolean ABType = false;
+        if (courseNameTemp.contains("-")) {
+            courseNameTemp = courseNameTemp.split("-")[0];
+            ABType = true;
+        }
+
         List<TBExamination> tbExaminationList = tbExaminationService.list(new QueryWrapper<TBExamination>().lambda()
                 .eq(TBExamination::getExamId, SystemConstant.convertIdToLong(examId))
                 .eq(TBExamination::getSchoolId, SystemConstant.convertIdToLong(schoolId))
-                .eq(TBExamination::getExaminationCourseCode, tbExamCourseService.getOne(new QueryWrapper<TBExamCourse>().lambda()
-                                .eq(TBExamCourse::getExamId, examId)
-                                .eq(TBExamCourse::getCourseCode, courseCode)
-                                .eq(TBExamCourse::getSchoolId, schoolId))
-                        .getExaminationCourseCode())
-                .eq(TBExamination::getCourseName, courseName)
+                .eq(TBExamination::getExaminationCourseCode, tbExamCourseService.getOne(
+                                new QueryWrapper<TBExamCourse>().lambda().eq(TBExamCourse::getExamId, examId).eq(TBExamCourse::getCourseCode, courseCode).eq(TBExamCourse::getSchoolId, schoolId))
+                        .getExaminationCourseCode()).eq(TBExamination::getCourseName, courseNameTemp)
                 .ne(TBExamination::getStudyType, "普通"));
         int count = tbExaminationList.size();
+        int actualCount = 0;
         if (count > 0) {
-            List<TBExamStudent> tbExamStudentList = tbExamStudentService.list(new QueryWrapper<TBExamStudent>().lambda()
-                    .eq(TBExamStudent::getExamId, examId)
-                    .eq(TBExamStudent::getSchoolId, schoolId)
-                    .eq(TBExamStudent::getCourseCode, courseCode));
+            List<TBExamStudent> tbExamStudentList = tbExamStudentService.list(
+                    new QueryWrapper<TBExamStudent>().lambda().eq(TBExamStudent::getExamId, examId).eq(TBExamStudent::getSchoolId, schoolId).eq(TBExamStudent::getCourseCode, courseCode));
 
             List<TBExamStudent> willUpdate = new ArrayList<>();
             for (TBExamination tbExamination : tbExaminationList) {
                 String studentCode = tbExamination.getStudentCode();
                 List<TBExamStudent> cellList = tbExamStudentList.stream().filter(e -> studentCode.equals(e.getStudentCode())).collect(Collectors.toList());
-                if (cellList.size() != 1) {
+                if (cellList.size() > 1) {
                     throw ExceptionResultEnum.ERROR.exception("数据异常");
+                } else if (cellList.size() == 0) {
+                    if (ABType) {
+                        continue;
+                    } else {
+                        throw ExceptionResultEnum.ERROR.exception("数据异常");
+                    }
                 }
+
                 TBExamStudent cell = cellList.get(0);
                 cell.setStudentCurrent(false);
                 willUpdate.add(cell);
+                actualCount++;
             }
             tbExamStudentService.saveOrUpdateBatch(willUpdate);
         }
-        return ResultUtil.ok("有【" + count + "】条非应届学生数据被更新");
+        return ResultUtil.ok("有【" + actualCount + "】条非应届学生数据被更新");
     }
 
     @ApiOperation(value = "异常考生-按学号处理")
@@ -1358,7 +1368,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("请选择要删除的用户");
@@ -1372,7 +1382,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)));
@@ -1382,7 +1392,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();
@@ -1392,7 +1402,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 {
 
@@ -1466,7 +1476,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();
@@ -1476,7 +1486,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/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.distributed.print.business.bean.params.LoginParam;
@@ -57,7 +56,7 @@ public class SysController {
     private DictionaryConfig dictionaryConfig;
 
     @Resource
-    CacheService cacheService;
+    CommonCacheService commonCacheService;
 
     @Resource
     TBSessionService tbSessionService;
@@ -92,7 +91,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());
@@ -100,7 +99,7 @@ public class SysController {
 
         BasicSchool basicSchool = null;
         if (!Objects.equals(login.getSchoolCode().toUpperCase(), RoleTypeEnum.ADMIN.name())) {
-            basicSchool = cacheService.schoolCache(login.getSchoolCode());
+            basicSchool = commonCacheService.schoolCache(login.getSchoolCode());
             if (Objects.isNull(basicSchool)) {
                 throw ExceptionResultEnum.SCHOOL_NO_DATA.exception();
             }
@@ -170,14 +169,14 @@ public class SysController {
     public Result logout() {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         TBSession tbSession = (TBSession) ServletUtil.getRequestSession();
-        AuthBean authBean = cacheService.userAuthCache(sysUser.getId());
+        AuthBean authBean = commonCacheService.userAuthCache(sysUser.getId());
         if (Objects.isNull(authBean)) {
             throw ExceptionResultEnum.NOT_LOGIN.exception();
         }
         tbSessionService.removeById(tbSession.getId());
         redisUtil.deleteUserSession(tbSession.getId());
-        cacheService.removeUserCache(sysUser.getId());
-        cacheService.removeUserAuthCache(sysUser.getId());
+        commonCacheService.removeUserCache(sysUser.getId());
+        commonCacheService.removeUserAuthCache(sysUser.getId());
         return ResultUtil.ok(new EditResult(sysUser.getId()));
     }
 
@@ -189,13 +188,13 @@ 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();
         QueryWrapper<SysUser> wrapper = new QueryWrapper<>();
         if (StringUtils.isNotBlank(loginParam.getSchoolCode())) {
-            BasicSchool basicSchool = cacheService.schoolCache(loginParam.getSchoolCode());
+            BasicSchool basicSchool = commonCacheService.schoolCache(loginParam.getSchoolCode());
             wrapper.lambda().eq(SysUser::getSchoolId, basicSchool.getId());
         }
         wrapper.lambda().eq(SysUser::getLoginName, loginName);
@@ -218,10 +217,10 @@ 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.equals(code.toUpperCase(), RoleTypeEnum.ADMIN.name())) {
-            BasicSchool basicSchool = cacheService.schoolCache(code);
+            BasicSchool basicSchool = commonCacheService.schoolCache(code);
             if (Objects.isNull(basicSchool)) {
                 throw ExceptionResultEnum.SCHOOL_NO_DATA.exception();
             }
@@ -312,7 +311,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/SysReportController.java

@@ -21,9 +21,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Api(tags = "教研分析学校公用Controller")
@@ -44,19 +42,29 @@ public class SysReportController {
     @RequestMapping(value = "/common/list_semester", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "考试信息", response = TBExamResult.class)})
     public Result listSemester(@ApiParam(value = "学校id", required = true) @RequestParam String schoolId) {
-        QueryWrapper<TBExam> tbExamQueryWrapper = new QueryWrapper<>();
-        tbExamQueryWrapper.select(" DISTINCT id,semester,exam_time ").eq("school_id", SystemConstant.convertIdToLong(schoolId)).orderByDesc("exam_time");
-        List<TBExam> tbExamList = tbExamService.list(tbExamQueryWrapper);
-        List<TBExamResult> tbExamResultList = null;
-        if (Objects.nonNull(tbExamList) && tbExamList.size() > 0) {
-            tbExamResultList = new ArrayList<>();
-            for (TBExam tbExam : tbExamList) {
-                if (!tbExamResultList.stream().map(TBExam::getSemester).collect(Collectors.toList()).contains(tbExam.getSemester())){
-                    tbExamResultList.add(new TBExamResult(tbExam.getId(), tbExam.getSemester()));
-                }
-            }
+//        QueryWrapper<TBExam> tbExamQueryWrapper = new QueryWrapper<>();
+//        tbExamQueryWrapper.select(" DISTINCT id,semester,exam_time ").eq("school_id", SystemConstant.convertIdToLong(schoolId)).orderByDesc("exam_time");
+//        List<TBExam> tbExamList = tbExamService.list(tbExamQueryWrapper);
+//        List<TBExamResult> tbExamResultList = null;
+//        if (Objects.nonNull(tbExamList) && tbExamList.size() > 0) {
+//            tbExamResultList = new ArrayList<>();
+//            for (TBExam tbExam : tbExamList) {
+//                if (!tbExamResultList.stream().map(TBExam::getSemester).collect(Collectors.toList()).contains(tbExam.getSemester())){
+//                    tbExamResultList.add(new TBExamResult(tbExam.getId(), tbExam.getSemester()));
+//                }
+//            }
+//        }
+        List<TBExamResult> result = new ArrayList<>();
+//        return ResultUtil.ok(tbExamResultList);
+        List<SemesterEnum> enumList = Arrays.stream(SemesterEnum.values()).sorted(Comparator.comparing(SemesterEnum::getIndex)).collect(Collectors.toList());
+        for (SemesterEnum semesterEnum : enumList) {
+            TBExamResult tbExamResult = new TBExamResult();
+            tbExamResult.setId(semesterEnum.getIndex().longValue());
+            tbExamResult.setSemester(semesterEnum);
+            tbExamResult.setSemesterStr(semesterEnum.getTitle());
+            result.add(tbExamResult);
         }
-        return ResultUtil.ok(tbExamResultList);
+        return ResultUtil.ok(result);
     }
 
     @ApiOperation(value = "考试列表")

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;
@@ -14,7 +13,7 @@ import com.qmth.teachcloud.common.entity.BasicSchool;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.enums.AppSourceEnum;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
-import com.qmth.teachcloud.common.service.CacheService;
+import com.qmth.teachcloud.common.service.CommonCacheService;
 import com.qmth.teachcloud.common.service.SysUserService;
 import com.qmth.teachcloud.common.service.TeachcloudCommonService;
 import com.qmth.teachcloud.common.util.JacksonUtil;
@@ -22,7 +21,6 @@ import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
 import com.qmth.teachcloud.report.business.cache.WhuUserAuthCacheUtil;
 import com.qmth.teachcloud.report.business.service.ReportCommonService;
-import com.qmth.teachcloud.report.business.utils.AesUtil;
 import com.qmth.teachcloud.report.business.utils.EncrypAES;
 import io.swagger.annotations.*;
 import org.apache.commons.lang3.StringUtils;
@@ -44,7 +42,6 @@ import java.net.URLEncoder;
 import java.security.NoSuchAlgorithmException;
 import java.security.Principal;
 import java.text.MessageFormat;
-import java.util.Base64;
 import java.util.Map;
 import java.util.Objects;
 
@@ -58,7 +55,7 @@ public class WudaOpenApiController {
     DictionaryConfig dictionaryConfig;
 
     @Resource
-    CacheService cacheService;
+    CommonCacheService commonCacheService;
 
     @Resource
     SysUserService sysUserService;
@@ -72,7 +69,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();
@@ -92,7 +89,7 @@ public class WudaOpenApiController {
             log.info("test-stu-map:{}", JSON.toJSONString(map));
             log.info("test-stu-cn:{}", cn);
         }
-        BasicSchool basicSchool = cacheService.schoolCache(SystemConstant.SCHOOL_CODE);
+        BasicSchool basicSchool = commonCacheService.schoolCache(SystemConstant.SCHOOL_CODE);
         String testUrl = dictionaryConfig.sysDomain().getReportUrl() + basicSchool.getId() + "/" + uid + "/" + cn;
         log.info("test-stu-testUrl:{}", testUrl);
         String encoderUid = EncrypAES.encrypt(uid);
@@ -103,7 +100,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(HttpServletRequest request, HttpServletResponse response) throws IOException {
         reportCommonService.whuLogout();
     }
@@ -111,7 +108,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();
@@ -149,7 +146,7 @@ public class WudaOpenApiController {
 //    @ApiOperation(value = "cas用户鉴权测试接口")
 //    @RequestMapping(value = "/user/authentication/test", method = RequestMethod.GET)
 //    @ApiResponses({@ApiResponse(code = 200, message = "返回消息", response = Result.class)})
-//    @Aac(auth = BOOL.FALSE)
+//    @Aac(auth = false)
 //    public void userAuthenticationTest(HttpServletRequest request, HttpServletResponse response) throws IOException {
 //        String uid = "yz1";
 //        UserAuthenticationDto userAuthenticationDto = new UserAuthenticationDto(uid, SystemConstant.getUuid());
@@ -164,7 +161,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) {
@@ -195,7 +192,7 @@ public class WudaOpenApiController {
 //    @ApiOperation(value = "cas鉴权接口")
 //    @RequestMapping(value = "/authentication/{studentCode}", method = RequestMethod.GET)
 //    @ApiResponses({@ApiResponse(code = 200, message = "返回消息", response = Result.class)})
-//    @Aac(auth = BOOL.FALSE)
+//    @Aac(auth = false)
 //    public void authenticationStudentCode(HttpServletRequest request, HttpServletResponse response, @PathVariable String studentCode
 //    ) throws IOException {
 //        BasicSchool basicSchool = cacheService.schoolCache(SystemConstant.SCHOOL_CODE);

teachcloud-report/src/main/java/com/qmth/teachcloud/report/aspect/ApiControllerAspect.java → teachcloud-report/src/main/java/com/qmth/teachcloud/report/aspect/TeachCloudControllerAspect.java

@@ -29,8 +29,8 @@ import java.util.Objects;
  */
 @Aspect
 @Component
-public class ApiControllerAspect {
-    private final static Logger log = LoggerFactory.getLogger(ApiControllerAspect.class);
+public class TeachCloudControllerAspect {
+    private final static Logger log = LoggerFactory.getLogger(TeachCloudControllerAspect.class);
 
     /**
      * api切入点

teachcloud-report/src/main/java/com/qmth/teachcloud/report/auth/TeachcloudReportAuthenticationService.java

@@ -12,7 +12,7 @@ import com.qmth.teachcloud.common.entity.TBSession;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.enums.PrivilegePropertyEnum;
 import com.qmth.teachcloud.common.enums.RoleTypeEnum;
-import com.qmth.teachcloud.common.service.CacheService;
+import com.qmth.teachcloud.common.service.CommonCacheService;
 import com.qmth.teachcloud.common.util.RedisUtil;
 import com.qmth.teachcloud.common.util.ServletUtil;
 import org.slf4j.Logger;
@@ -31,7 +31,7 @@ public class TeachcloudReportAuthenticationService implements AuthorizationServi
     private final static Logger log = LoggerFactory.getLogger(TeachcloudReportAuthenticationService.class);
 
     @Resource
-    CacheService cacheService;
+    CommonCacheService commonCacheService;
 
     @Resource
     RedisUtil redisUtil;
@@ -67,7 +67,7 @@ public class TeachcloudReportAuthenticationService implements AuthorizationServi
                 throw ExceptionResultEnum.AUTHORIZATION_ERROR.exception();
             }
             Long userId = Long.parseLong(tbSession.getIdentity());
-            SysUser sysUser = cacheService.userCache(userId);
+            SysUser sysUser = commonCacheService.userCache(userId);
             HttpServletRequest request = ServletUtil.getRequest();
             HttpServletResponse response = ServletUtil.getResponse();
             request.setAttribute(SystemConstant.SESSION, tbSession);
@@ -105,7 +105,7 @@ public class TeachcloudReportAuthenticationService implements AuthorizationServi
                                   HttpServletRequest request,
                                   HttpServletResponse response) {
         //验证权限
-        AuthBean authBean = type.contains(SystemConstant.USER_OAUTH_CACHE) ? authBean = cacheService.userAuthCache(userId) : null;
+        AuthBean authBean = type.contains(SystemConstant.USER_OAUTH_CACHE) ? authBean = commonCacheService.userAuthCache(userId) : null;
         if (Objects.isNull(authBean)) {
             throw ExceptionResultEnum.ROLE_ENABLE_AUTHORIZATION.exception();
         }
@@ -118,7 +118,7 @@ public class TeachcloudReportAuthenticationService implements AuthorizationServi
             return true;
         }
         //系统公用接口不拦截
-        List<String> sysUrls = cacheService.privilegeUrlCache(PrivilegePropertyEnum.SYS);
+        List<String> sysUrls = commonCacheService.privilegeUrlCache(PrivilegePropertyEnum.SYS);
         int sysCount = Objects.nonNull(sysUrls) ? (int) sysUrls.stream().filter(s -> s.equalsIgnoreCase(path)).count() : 0;
         if (sysCount > 0) {
             return true;