去掉机构和配置文件更新

distributed-print-business/pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.qmth.distributed.print.business</groupId>
     <artifactId>distributed-print-business</artifactId>
-    <version>3.1.0</version>
+    <version>3.2.0</version>
     <build>
         <plugins>
             <plugin>
@@ -22,7 +22,7 @@
     <parent>
         <groupId>com.qmth.distributed.print.service</groupId>
         <artifactId>distributed-print-service</artifactId>
-        <version>3.1.0</version>
+        <version>3.2.0</version>
     </parent>
 
     <dependencies>

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

@@ -1668,17 +1668,19 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
         String paperNumber = examTask.getPaperNumber();
         String paperName = basicSemesterService.getById(basicExamService.getById(examTask.getExamId()).getSemesterId()).getName();
         Long teachingRoomId = examTask.getTeachingRoomId();
-        SysOrg teachingRoom = sysOrgService.getOne(new QueryWrapper<SysOrg>().lambda().eq(SysOrg::getId, teachingRoomId).eq(SysOrg::getType, OrgTypeEnum.TEACHING_ROOM));
-        if (Objects.isNull(teachingRoom)) {
-            throw ExceptionResultEnum.ERROR.exception("找不到教研室");
-        }
+//        SysOrg teachingRoom = sysOrgService.getOne(new QueryWrapper<SysOrg>().lambda().eq(SysOrg::getId, teachingRoomId).eq(SysOrg::getType, OrgTypeEnum.TEACHING_ROOM));
+//        if (Objects.isNull(teachingRoom)) {
+//            throw ExceptionResultEnum.ERROR.exception("找不到教研室");
+//        }
+        SysOrg teachingRoom = null;
         String teachingRoomName = teachingRoom.getName();
 
         // 查询教研室所在学院
-        List<SysOrg> collegeList = sysOrgService.findParentsByOrgId(teachingRoom.getId())
-                .stream()
-                .filter(e -> OrgTypeEnum.COLLEGE.equals(e.getType()))
-                .collect(Collectors.toList());
+//        List<SysOrg> collegeList = sysOrgService.findParentsByOrgId(teachingRoom.getId())
+//                .stream()
+//                .filter(e -> OrgTypeEnum.COLLEGE.equals(e.getType()))
+//                .collect(Collectors.toList());
+        List<SysOrg> collegeList = null;
 //        List<SysOrg> collegeList = sysOrgService.findByConnectByParentId(teachingRoom.getId(),true)
 //                .stream()
 //                .filter(e -> OrgTypeEnum.COLLEGE.equals(e.getType()))

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

@@ -16,7 +16,6 @@ import com.qmth.teachcloud.common.entity.SysOrg;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.enums.GradeAnalyzePaperStatusEnum;
-import com.qmth.teachcloud.common.enums.OrgTypeEnum;
 import com.qmth.teachcloud.common.service.SysOrgService;
 import com.qmth.teachcloud.common.service.TeachcloudCommonService;
 import org.springframework.beans.BeanUtils;
@@ -244,10 +243,11 @@ public class GradeBatchPaperServiceImpl extends ServiceImpl<GradeBatchPaperMappe
             throw ExceptionResultEnum.ERROR.exception("机构id不存在");
         }
 
-        List<SysOrg> collegeList = sysOrgService.findParentsByOrgId(orgId).stream().filter(e -> OrgTypeEnum.COLLEGE.equals(e.getType())).distinct().collect(Collectors.toList());
-        if (collegeList.size() != 1) {
-            throw ExceptionResultEnum.ERROR.exception("未找到开课学院");
-        }
+        List<SysOrg> collegeList = null;
+//        List<SysOrg> collegeList = sysOrgService.findParentsByOrgId(orgId).stream().filter(e -> OrgTypeEnum.COLLEGE.equals(e.getType())).distinct().collect(Collectors.toList());
+//        if (collegeList.size() != 1) {
+//            throw ExceptionResultEnum.ERROR.exception("未找到开课学院");
+//        }
         return collegeList.get(0);
     }
 

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

@@ -133,15 +133,9 @@ public class PrintCommonServiceImpl implements PrintCommonService {
     @Autowired
     BasicExamService basicExamService;
 
-    @Resource
-    GradeBatchService gradeBatchService;
-
     @Resource
     GradeBatchPaperService gradeBatchPaperService;
 
-    @Resource
-    GradeModuleEvaluationService gradeModuleEvaluationService;
-
     /**
      * 保存附件
      *
@@ -159,7 +153,7 @@ public class PrintCommonServiceImpl implements PrintCommonService {
     public BasicAttachment saveAttachmentPdf(ClassifyEnum classifyEnum, ExamDetail examDetail, BasicAttachment basicAttachment, List<PdfDto> pdfList, Integer printCount, Integer sequence) throws IOException, DocumentException {
         try {
             BasicSchool basicSchool = basicSchoolService.getById(examDetail.getSchoolId());
-            Map<String, List<String>> flowSchoolCodeMap = SystemConstant.getFlowSchoolCodeMap();
+//            Map<String, List<String>> flowSchoolCodeMap = SystemConstant.getFlowSchoolCodeMap();
 
             boolean oss = dictionaryConfig.sysDomain().isOss();
             JSONObject jsonObject = JSONObject.parseObject(basicAttachment.getPath());
@@ -207,13 +201,13 @@ public class PrintCommonServiceImpl implements PrintCommonService {
                 pdfFile.getParentFile().mkdirs();
                 pdfFile.createNewFile();
             }
-            if (flowSchoolCodeMap.get(SystemConstant.GDYKDX_FLOW_KEY).contains(basicSchool.getCode())) {
-                HtmlToPdfUtil.convert(htmlFile.getPath(), destUrl, PageSizeEnum.A3);
-            } else if (flowSchoolCodeMap.get(SystemConstant.JXZYY_FLOW_KEY).contains(basicSchool.getCode())) {
-                HtmlToPdfUtil.convert(htmlFile.getPath(), destUrl, PageSizeEnum.A4);
-            } else {
-                HtmlToPdfUtil.convert(htmlFile.getPath(), destUrl, PageSizeEnum.A4);
-            }
+//            if (flowSchoolCodeMap.get(SystemConstant.GDYKDX_FLOW_KEY).contains(basicSchool.getCode())) {
+//                HtmlToPdfUtil.convert(htmlFile.getPath(), destUrl, PageSizeEnum.A3);
+//            } else if (flowSchoolCodeMap.get(SystemConstant.JXZYY_FLOW_KEY).contains(basicSchool.getCode())) {
+//                HtmlToPdfUtil.convert(htmlFile.getPath(), destUrl, PageSizeEnum.A4);
+//            } else {
+            HtmlToPdfUtil.convert(htmlFile.getPath(), destUrl, PageSizeEnum.A4);
+//            }
 
 //            File pdfFile = asposePdfUtil.documentToPdf(htmlFile.getPath(), destUrl, PaperSize.A4);
             String htmlFileMd5 = DigestUtils.md5Hex(new FileInputStream(htmlFile));
@@ -252,13 +246,13 @@ public class PrintCommonServiceImpl implements PrintCommonService {
             examDetail.setAttachmentPath(attachmentPath.toJSONString());
             basicAttachment.setPages(pdfDto.getActualPageCount());
             for (int i = 0; i < printCount; i++) {
-                if (flowSchoolCodeMap.get(SystemConstant.GDYKDX_FLOW_KEY).contains(basicSchool.getCode())) {
-                    pdfList.add(new PdfDto(pdfFile.getPath(), PageSizeEnum.A3, pdfDto.getPageCount(), sequence));
-                } else if (flowSchoolCodeMap.get(SystemConstant.JXZYY_FLOW_KEY).contains(basicSchool.getCode())) {
-                    pdfList.add(new PdfDto(pdfFile.getPath(), PageSizeEnum.A4, pdfDto.getPageCount(), sequence));
-                } else {
-                    pdfList.add(new PdfDto(pdfFile.getPath(), PageSizeEnum.A4, pdfDto.getPageCount(), sequence));
-                }
+//                if (flowSchoolCodeMap.get(SystemConstant.GDYKDX_FLOW_KEY).contains(basicSchool.getCode())) {
+//                    pdfList.add(new PdfDto(pdfFile.getPath(), PageSizeEnum.A3, pdfDto.getPageCount(), sequence));
+//                } else if (flowSchoolCodeMap.get(SystemConstant.JXZYY_FLOW_KEY).contains(basicSchool.getCode())) {
+//                    pdfList.add(new PdfDto(pdfFile.getPath(), PageSizeEnum.A4, pdfDto.getPageCount(), sequence));
+//                } else {
+                pdfList.add(new PdfDto(pdfFile.getPath(), PageSizeEnum.A4, pdfDto.getPageCount(), sequence));
+//                }
             }
         } catch (Exception e) {
             log.error(SystemConstant.LOG_ERROR, e);
@@ -943,7 +937,7 @@ public class PrintCommonServiceImpl implements PrintCommonService {
             QueryWrapper<TBSyncTask> queryWrapper = new QueryWrapper<>();
             queryWrapper.lambda().eq(TBSyncTask::getType, pushTypeEnum).eq(TBSyncTask::getObjectId, objectId).ne(TBSyncTask::getStatus, TaskStatusEnum.FINISH);
             List<TBSyncTask> list = tbSyncTaskService.list(queryWrapper);
-            if(!list.isEmpty()){
+            if (!list.isEmpty()) {
                 throw ExceptionResultEnum.ERROR.exception("当前同步条件下有任务正在进行中");
             }
             map = new HashMap<>();

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

@@ -1503,8 +1503,10 @@ public class TaskLogicServiceImpl implements TaskLogicService {
                 List<Object> statisticsTempList = excelMap.get(i);
                 for (int y = 0; y < Objects.requireNonNull(statisticsTempList).size(); y++) {
                     StatisticsImportDto statisticsImportDto = (StatisticsImportDto) statisticsTempList.get(y);
-                    SysOrg collegeOrg = this.validSysOrgExists(collegeOrgMap, statisticsImportDto.getCollegeName(), sysUser.getSchoolId(), OrgTypeEnum.COLLEGE, excelErrorTemp, (y + 1), (i + 1), "开课学院");
-                    SysOrg teachingRoomOrg = this.validSysOrgExists(teachingRoomMap, statisticsImportDto.getTeachingRoomName(), sysUser.getSchoolId(), OrgTypeEnum.TEACHING_ROOM, excelErrorTemp, (y + 1), (i + 1), "开课部门");
+//                    SysOrg collegeOrg = this.validSysOrgExists(collegeOrgMap, statisticsImportDto.getCollegeName(), sysUser.getSchoolId(), OrgTypeEnum.COLLEGE, excelErrorTemp, (y + 1), (i + 1), "开课学院");
+//                    SysOrg teachingRoomOrg = this.validSysOrgExists(teachingRoomMap, statisticsImportDto.getTeachingRoomName(), sysUser.getSchoolId(), OrgTypeEnum.TEACHING_ROOM, excelErrorTemp, (y + 1), (i + 1), "开课部门");
+                    SysOrg collegeOrg = null;
+                    SysOrg teachingRoomOrg = null;
                     BasicCourse basicCourse = this.validBasicCourseExists(courseMap, statisticsImportDto.getCourseName(), sysUser.getSchoolId(), statisticsImportDto.getCourseCode(), excelErrorTemp, (y + 1), (i + 1));
                     String teacherName = statisticsImportDto.getTeacherName();
                     String clazzNames = statisticsImportDto.getClazzName();

distributed-print-business/src/main/java/com/qmth/distributed/print/business/util/CreatePdfUtil.java

@@ -108,7 +108,7 @@ public class CreatePdfUtil {
      */
     public void createCheckIn(ExamDetail examDetail, BasicAttachment basicAttachment, List<PdfDto> ordinaryPdfList, Integer printCount) throws Exception {
         BasicSchool basicSchool = basicSchoolService.getById(examDetail.getSchoolId());
-        Map<String, List<String>> flowSchoolCodeMap = SystemConstant.getFlowSchoolCodeMap();
+//        Map<String, List<String>> flowSchoolCodeMap = SystemConstant.getFlowSchoolCodeMap();
         if (Objects.isNull(basicAttachment)) {
             throw ExceptionResultEnum.ATTACHMENT_IS_NULL.exception();
         }
@@ -124,13 +124,13 @@ public class CreatePdfUtil {
             File localFile = fileStoreUtil.ossDownload(filePath, url, uploadFileEnum.getFssType());
             PdfDto pdfDto = PdfUtil.addPdfPage(localFile);
             for (int i = 0; i < printCount; i++) {
-                if (flowSchoolCodeMap.get(SystemConstant.GDYKDX_FLOW_KEY).contains(basicSchool.getCode())) {
-                    ordinaryPdfList.add(new PdfDto(localFile.getPath(), PageSizeEnum.A3, pdfDto.getPageCount()));
-                } else if (flowSchoolCodeMap.get(SystemConstant.JXZYY_FLOW_KEY).contains(basicSchool.getCode())) {
+//                if (flowSchoolCodeMap.get(SystemConstant.GDYKDX_FLOW_KEY).contains(basicSchool.getCode())) {
+//                    ordinaryPdfList.add(new PdfDto(localFile.getPath(), PageSizeEnum.A3, pdfDto.getPageCount()));
+//                } else if (flowSchoolCodeMap.get(SystemConstant.JXZYY_FLOW_KEY).contains(basicSchool.getCode())) {
+//                    ordinaryPdfList.add(new PdfDto(localFile.getPath(), PageSizeEnum.A4, pdfDto.getPageCount()));
+//                } else {
                     ordinaryPdfList.add(new PdfDto(localFile.getPath(), PageSizeEnum.A4, pdfDto.getPageCount()));
-                } else {
-                    ordinaryPdfList.add(new PdfDto(localFile.getPath(), PageSizeEnum.A4, pdfDto.getPageCount()));
-                }
+//                }
             }
         } else {
             printCommonService.saveAttachmentPdf(ClassifyEnum.CHECK_IN, examDetail, basicAttachment, ordinaryPdfList, printCount, 0);
@@ -161,19 +161,19 @@ public class CreatePdfUtil {
             htmlMap.put("courseName", String.join(", ", courseNames));
             htmlMap.put("courseCode", String.join(", ", paperNumbers));
             // 学院
-            Set<String> stringSet = new HashSet<>();
-            List<BasicCourse> basicCourses = basicCourseService.findBySchoolIdAndCourseCode(examDetail.getSchoolId(), courseCodes);
-            for (BasicCourse basicCours : basicCourses) {
-                List<SysOrg> sysOrgs = sysOrgService.findParentsByOrgId(basicCours.getTeachingRoomId());
-                Set<String> collegeName = sysOrgs.stream().filter(m -> OrgTypeEnum.COLLEGE.equals(m.getType())).map(m -> m.getName()).collect(Collectors.toSet());
-                if (CollectionUtils.isEmpty(collegeName)) {
-                    collegeName = sysOrgs.stream().filter(m -> OrgTypeEnum.FACULTY.equals(m.getType())).map(m -> m.getName()).collect(Collectors.toSet());
-                }
-                if (!CollectionUtils.isEmpty(collegeName)) {
-                    stringSet.addAll(collegeName);
-                }
-            }
-            htmlMap.put("collegeName", CollectionUtils.isEmpty(stringSet) ? "" : String.join(",", stringSet));
+//            Set<String> stringSet = new HashSet<>();
+//            List<BasicCourse> basicCourses = basicCourseService.findBySchoolIdAndCourseCode(examDetail.getSchoolId(), courseCodes);
+//            for (BasicCourse basicCours : basicCourses) {
+//                List<SysOrg> sysOrgs = sysOrgService.findParentsByOrgId(basicCours.getTeachingRoomId());
+//                Set<String> collegeName = sysOrgs.stream().filter(m -> OrgTypeEnum.COLLEGE.equals(m.getType())).map(m -> m.getName()).collect(Collectors.toSet());
+//                if (CollectionUtils.isEmpty(collegeName)) {
+//                    collegeName = sysOrgs.stream().filter(m -> OrgTypeEnum.FACULTY.equals(m.getType())).map(m -> m.getName()).collect(Collectors.toSet());
+//                }
+//                if (!CollectionUtils.isEmpty(collegeName)) {
+//                    stringSet.addAll(collegeName);
+//                }
+//            }
+//            htmlMap.put("collegeName", CollectionUtils.isEmpty(stringSet) ? "" : String.join(",", stringSet));
         } else {
             htmlMap.put("courseName", "");
             htmlMap.put("courseCode", "");

distributed-print/pom.xml

@@ -4,13 +4,13 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.qmth.distributed.print</groupId>
     <artifactId>distributed-print</artifactId>
-    <version>3.1.0</version>
+    <version>3.2.0</version>
     <packaging>jar</packaging>
 
     <parent>
         <groupId>com.qmth.distributed.print.service</groupId>
         <artifactId>distributed-print-service</artifactId>
-        <version>3.1.0</version>
+        <version>3.2.0</version>
     </parent>
 
     <dependencies>

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

@@ -8,14 +8,12 @@ import com.qmth.boot.api.exception.ApiException;
 import com.qmth.distributed.print.business.bean.params.LoginParam;
 import com.qmth.distributed.print.business.bean.result.DictionaryResult;
 import com.qmth.distributed.print.business.bean.result.EditResult;
-import com.qmth.distributed.print.business.entity.ExamPrintPlan;
 import com.qmth.distributed.print.business.entity.TBSyncTask;
 import com.qmth.distributed.print.business.entity.TeachClazz;
 import com.qmth.distributed.print.business.enums.DictionaryEnum;
 import com.qmth.distributed.print.business.enums.LoginTypeEnum;
 import com.qmth.distributed.print.business.service.*;
 import com.qmth.distributed.print.business.util.PdfUtil;
-import com.qmth.teachcloud.common.base.BaseEntity;
 import com.qmth.teachcloud.common.bean.auth.AuthBean;
 import com.qmth.teachcloud.common.bean.result.LoginResult;
 import com.qmth.teachcloud.common.bean.result.UserLoginCheckResult;
@@ -608,56 +606,56 @@ public class SysController {
                     return dictionaryResult;
                 }).collect(Collectors.toList());
                 break;
-            case COLLEGE:
-                if (Objects.nonNull(semesterId)) {
-                    QueryWrapper<BasicExam> basicExamQueryWrapper = new QueryWrapper<>();
-                    basicExamQueryWrapper.lambda().eq(BasicExam::getSemesterId, SystemConstant.convertIdToLong(semesterId));
-                    List<BasicExam> basicExamList = basicExamService.list(basicExamQueryWrapper);
-                    if (Objects.nonNull(basicExamList) && basicExamList.size() > 0) {
-                        List<Long> examIdList = basicExamList.stream().map(BaseEntity::getId).collect(Collectors.toList());
-                        QueryWrapper<ExamPrintPlan> examPrintPlanQueryWrapper = new QueryWrapper<>();
-                        examPrintPlanQueryWrapper.lambda().in(ExamPrintPlan::getExamId, examIdList);
-                        List<ExamPrintPlan> examPrintPlanList = examPrintPlanService.list(examPrintPlanQueryWrapper);
-                        if (Objects.nonNull(examPrintPlanList) && examPrintPlanList.size() > 0) {
-                            Set<Long> orgIdSet = examPrintPlanList.stream().map(ExamPrintPlan::getOrgId).collect(Collectors.toSet());
-                            QueryWrapper<SysOrg> sysOrgQueryWrapper = new QueryWrapper<>();
-                            sysOrgQueryWrapper.lambda().in(SysOrg::getId, orgIdSet);
-                            List<SysOrg> sysOrgList = sysOrgService.list(sysOrgQueryWrapper);
-                            List<SysOrg> newSysOrgList = new ArrayList<>(sysOrgList);
-                            for (SysOrg s : sysOrgList) {
-                                if (s.getType() == OrgTypeEnum.SCHOOL) {
-                                    newSysOrgList.addAll(sysOrgService.findByConnectByRootOrgId(s.getId()));
-                                } else if (s.getType() == OrgTypeEnum.TEACHING_ROOM || s.getType() == OrgTypeEnum.FACULTY || s.getType() == OrgTypeEnum.PRINTING_HOUSE) {
-                                    newSysOrgList.addAll(sysOrgService.findByConnectByParentId(s.getId(), true, false));
-                                }
-                            }
-                            Map<Long, SysOrg> sysOrgMap = new LinkedHashMap<>();
-                            for (SysOrg s : newSysOrgList) {
-                                if (s.getType() == OrgTypeEnum.COLLEGE) {
-                                    sysOrgMap.put(s.getId(), s);
-                                }
-                            }
-                            List<DictionaryResult> finalDictionaryResultList = dictionaryResultList;
-                            sysOrgMap.forEach((k, v) -> {
-                                DictionaryResult dictionaryResult = new DictionaryResult();
-                                dictionaryResult.setId(v.getId());
-                                dictionaryResult.setCode(v.getCode());
-                                dictionaryResult.setName(v.getName());
-                                finalDictionaryResultList.add(dictionaryResult);
-                            });
-                        }
-                    }
-                } else {
-                    List<SysOrg> sysOrgList = sysOrgService.list(new QueryWrapper<SysOrg>().lambda().eq(SysOrg::getSchoolId, schoolId).eq(SysOrg::getEnable, true));
-                    dictionaryResultList = sysOrgList.stream().map(e -> {
-                        DictionaryResult dictionaryResult = new DictionaryResult();
-                        dictionaryResult.setId(e.getId());
-                        dictionaryResult.setCode(e.getCode());
-                        dictionaryResult.setName(e.getName());
-                        return dictionaryResult;
-                    }).collect(Collectors.toList());
-                }
-                break;
+//            case COLLEGE:
+//                if (Objects.nonNull(semesterId)) {
+//                    QueryWrapper<BasicExam> basicExamQueryWrapper = new QueryWrapper<>();
+//                    basicExamQueryWrapper.lambda().eq(BasicExam::getSemesterId, SystemConstant.convertIdToLong(semesterId));
+//                    List<BasicExam> basicExamList = basicExamService.list(basicExamQueryWrapper);
+//                    if (Objects.nonNull(basicExamList) && basicExamList.size() > 0) {
+//                        List<Long> examIdList = basicExamList.stream().map(BaseEntity::getId).collect(Collectors.toList());
+//                        QueryWrapper<ExamPrintPlan> examPrintPlanQueryWrapper = new QueryWrapper<>();
+//                        examPrintPlanQueryWrapper.lambda().in(ExamPrintPlan::getExamId, examIdList);
+//                        List<ExamPrintPlan> examPrintPlanList = examPrintPlanService.list(examPrintPlanQueryWrapper);
+//                        if (Objects.nonNull(examPrintPlanList) && examPrintPlanList.size() > 0) {
+//                            Set<Long> orgIdSet = examPrintPlanList.stream().map(ExamPrintPlan::getOrgId).collect(Collectors.toSet());
+//                            QueryWrapper<SysOrg> sysOrgQueryWrapper = new QueryWrapper<>();
+//                            sysOrgQueryWrapper.lambda().in(SysOrg::getId, orgIdSet);
+//                            List<SysOrg> sysOrgList = sysOrgService.list(sysOrgQueryWrapper);
+//                            List<SysOrg> newSysOrgList = new ArrayList<>(sysOrgList);
+//                            for (SysOrg s : sysOrgList) {
+//                                if (s.getType() == OrgTypeEnum.SCHOOL) {
+//                                    newSysOrgList.addAll(sysOrgService.findByConnectByRootOrgId(s.getId()));
+//                                } else if (s.getType() == OrgTypeEnum.TEACHING_ROOM || s.getType() == OrgTypeEnum.FACULTY || s.getType() == OrgTypeEnum.PRINTING_HOUSE) {
+//                                    newSysOrgList.addAll(sysOrgService.findByConnectByParentId(s.getId(), true, false));
+//                                }
+//                            }
+//                            Map<Long, SysOrg> sysOrgMap = new LinkedHashMap<>();
+//                            for (SysOrg s : newSysOrgList) {
+//                                if (s.getType() == OrgTypeEnum.COLLEGE) {
+//                                    sysOrgMap.put(s.getId(), s);
+//                                }
+//                            }
+//                            List<DictionaryResult> finalDictionaryResultList = dictionaryResultList;
+//                            sysOrgMap.forEach((k, v) -> {
+//                                DictionaryResult dictionaryResult = new DictionaryResult();
+//                                dictionaryResult.setId(v.getId());
+//                                dictionaryResult.setCode(v.getCode());
+//                                dictionaryResult.setName(v.getName());
+//                                finalDictionaryResultList.add(dictionaryResult);
+//                            });
+//                        }
+//                    }
+//                } else {
+//                    List<SysOrg> sysOrgList = sysOrgService.list(new QueryWrapper<SysOrg>().lambda().eq(SysOrg::getSchoolId, schoolId).eq(SysOrg::getEnable, true));
+//                    dictionaryResultList = sysOrgList.stream().map(e -> {
+//                        DictionaryResult dictionaryResult = new DictionaryResult();
+//                        dictionaryResult.setId(e.getId());
+//                        dictionaryResult.setCode(e.getCode());
+//                        dictionaryResult.setName(e.getName());
+//                        return dictionaryResult;
+//                    }).collect(Collectors.toList());
+//                }
+//                break;
             case MAJOR:
                 QueryWrapper<BasicMajor> majorQueryWrapper = new QueryWrapper<>();
                 majorQueryWrapper.lambda()

distributed-print/src/main/resources/application-36dev.properties

@@ -60,19 +60,12 @@ sys.config.attachmentSize=200
 sys.config.serverUpload=
 sys.config.fileHost=http://127.0.0.1
 sys.config.serverHost=http://127.0.0.1
-#sys.config.accessKey=0bce69d94a7b4aef8bc0badf150351a9
-#sys.config.accessSecret=LdUwb5X4etmjW7fDn0KAdoXG0Yt7AkDu
-sys.config.accessKey=274f823e5f59410f8b3bb6edcd8e2b6e
-sys.config.accessSecret=y7AO6W0TOdTF8HpWBwGHbp3wfIHsmUKr
 sys.config.adminLogoUrl=http://qmth-test.oss-cn-shenzhen.aliyuncs.com/frontend/wx_logo.png
-#sys.config.htmlToPdfUrl=/usr/local/bin/wkhtmltopdf
 sys.config.htmlToPdfUrl=/usr/local/bin/wkhtmltopdf
 sys.config.autoCreatePdfResetMaxCount=5
 sys.config.threadPoolCoreSize=1
 sys.config.customThreadPoolCoreSize=true
 sys.config.sessionActive=4h
-sys.config.flowSchoolCodeMap.GdykdxPaperApprove=test-school-2
-sys.config.flowSchoolCodeMap.JxzyyPaperApprove=test-school-1,test-school-3
 spring.resources.static-locations=file:${sys.config.serverUpload},classpath:/META-INF/resources/,classpath:/resources/
 sys.config.fileTempPath=/Users/king/Downloads/file-temp
 sys.config.pdfTempPath=/Users/king/Downloads/pdf-temp

distributed-print/src/main/resources/application-dev.properties

@@ -12,7 +12,7 @@ spring.application.name=distributed-print
 #\u6570\u636E\u6E90\u914D\u7F6E
 db.host=localhost
 db.port=3306
-db.name=distributed-v3.1.0
+db.name=distributed-v3.2.0
 db.username=root
 db.password=123456789
 
@@ -52,30 +52,20 @@ com.qmth.fss.public.server=https://oss-file.qmth.com.cn/teachcloud-print-dev-pub
 com.qmth.fss.private.config=oss://key:secret@teachcloud-print-dev-private.oss-api.qmth.com.cn
 com.qmth.fss.private.server=https://oss-file.qmth.com.cn/teachcloud-print-dev-private
 
-#com.qmth.fss.fileTemp.config=oss://key:secret@teachcloud-print-dev-public.oss-api.qmth.com.cn
-#com.qmth.fss.fileTemp.server=https://oss-file.qmth.com.cn/teachcloud-print-dev-public
-#com.qmth.fss.pdfTemp.config=oss://key:secret@teachcloud-print-dev-private.oss-api.qmth.com.cn
-#com.qmth.fss.pdfTemp.server=https://oss-file.qmth.com.cn/teachcloud-print-dev-private
-
 #\u7CFB\u7EDF\u914D\u7F6E
-sys.config.oss=false
+sys.config.oss=true
 sys.config.attachmentType=.xlsx,.xls,.doc,.docx,.pdf,.jpg,.jpeg,.png,.html,.zip,.mp3,.wav,.dll,.exe,.ftl,.bpmn,.xml
 sys.config.attachmentLength=100
 sys.config.attachmentSize=200
 sys.config.serverUpload=
 sys.config.fileHost=http://127.0.0.1:7001
 sys.config.serverHost=http://127.0.0.1:7001
-sys.config.accessKey=274f823e5f59410f8b3bb6edcd8e2b6e
-sys.config.accessSecret=y7AO6W0TOdTF8HpWBwGHbp3wfIHsmUKr
 sys.config.adminLogoUrl=http://qmth-test.oss-cn-shenzhen.aliyuncs.com/frontend/wx_logo.png
 sys.config.htmlToPdfUrl=/usr/local/bin/wkhtmltopdf
-#sys.config.htmlToPdfUrl=E:/devUtils/wkhtmltopdf/bin/wkhtmltopdf.exe
 sys.config.autoCreatePdfResetMaxCount=5
 sys.config.threadPoolCoreSize=1
 sys.config.customThreadPoolCoreSize=true
 sys.config.sessionActive=4h
-sys.config.flowSchoolCodeMap.GdykdxPaperApprove=test-school-2
-sys.config.flowSchoolCodeMap.JxzyyPaperApprove=test-school-1,test-school-3
 spring.resources.static-locations=file:${sys.config.serverUpload},classpath:/META-INF/resources/,classpath:/resources/
 sys.config.fileTempPath=/Users/king/Downloads/file-temp
 sys.config.pdfTempPath=/Users/king/Downloads/pdf-temp
@@ -129,7 +119,6 @@ com.qmth.logging.file-path=/Users/king/Downloads/distributed-print.log
 
 #\uFFFD\uFFFD\uFFFD\u013E\uFFFD\uFFFD\uFFFD\uFFFDurl
 sync.config.hostUrl=http://192.168.10.224:80
-#sync.config.hostUrl=http://localhost:8081
 #\u036C\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
 sync.config.examSaveUrl=/api/exam/save
 #\u036C\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD

distributed-print/src/main/resources/application-offline.properties

@@ -60,18 +60,12 @@ sys.config.attachmentSize=200
 sys.config.serverUpload=
 sys.config.fileHost=http://192.168.10.138:7781
 sys.config.serverHost=http://192.168.10.138:7781
-#sys.config.accessKey=0bce69d94a7b4aef8bc0badf150351a9
-#sys.config.accessSecret=LdUwb5X4etmjW7fDn0KAdoXG0Yt7AkDu
-sys.config.accessKey=918d0878ee7944beb448980b011ff804
-sys.config.accessSecret=IY3NB9FXtd7OQHWH5YHl6mbrU9ch33QC
 sys.config.adminLogoUrl=http://qmth-test.oss-cn-shenzhen.aliyuncs.com/frontend/wx_logo.png
 sys.config.htmlToPdfUrl=/usr/local/bin/wkhtmltopdf
 sys.config.autoCreatePdfResetMaxCount=5
 sys.config.threadPoolCoreSize=1
 sys.config.customThreadPoolCoreSize=false
 sys.config.sessionActive=4h
-sys.config.flowSchoolCodeMap.GdykdxPaperApprove=test-school-0
-sys.config.flowSchoolCodeMap.JxzyyPaperApprove=test-school-1,test-school-2
 spring.resources.static-locations=file:${sys.config.serverUpload},classpath:/META-INF/resources/,classpath:/resources/
 sys.config.fileTempPath=/file-temp
 sys.config.pdfTempPath=/pdf-temp

distributed-print/src/main/resources/application-test.properties

@@ -60,18 +60,12 @@ sys.config.attachmentSize=200
 sys.config.serverUpload=
 sys.config.fileHost=https://*.teach-cloud-test.com
 sys.config.serverHost=https://*.teach-cloud-test.com
-#sys.config.accessKey=0bce69d94a7b4aef8bc0badf150351a9
-#sys.config.accessSecret=LdUwb5X4etmjW7fDn0KAdoXG0Yt7AkDu
-sys.config.accessKey=918d0878ee7944beb448980b011ff804
-sys.config.accessSecret=IY3NB9FXtd7OQHWH5YHl6mbrU9ch33QC
 sys.config.adminLogoUrl=http://qmth-test.oss-cn-shenzhen.aliyuncs.com/frontend/wx_logo.png
 sys.config.htmlToPdfUrl=/usr/local/bin/wkhtmltopdf
 sys.config.autoCreatePdfResetMaxCount=5
 sys.config.threadPoolCoreSize=1
 sys.config.customThreadPoolCoreSize=false
 sys.config.sessionActive=4h
-sys.config.flowSchoolCodeMap.GdykdxPaperApprove=test-school-0
-sys.config.flowSchoolCodeMap.JxzyyPaperApprove=test-school-1,test-school-2
 spring.resources.static-locations=file:${sys.config.serverUpload},classpath:/META-INF/resources/,classpath:/resources/
 sys.config.fileTempPath=/Users/king/Downloads/file-temp
 sys.config.pdfTempPath=/Users/king/Downloads/pdf-temp

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.qmth.distributed.print.service</groupId>
     <artifactId>distributed-print-service</artifactId>
-    <version>3.1.0</version>
+    <version>3.2.0</version>
     <packaging>pom</packaging>
 
     <modules>

teachcloud-common-api/pom.xml

@@ -4,13 +4,13 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.qmth.teachcloud.common.api</groupId>
 	<artifactId>teachcloud-common-api</artifactId>
-	<version>3.1.0</version>
+	<version>3.2.0</version>
 	<packaging>jar</packaging>
 
 	<parent>
 		<groupId>com.qmth.distributed.print.service</groupId>
 		<artifactId>distributed-print-service</artifactId>
-		<version>3.1.0</version>
+		<version>3.2.0</version>
 	</parent>
 
 	<dependencies>

teachcloud-common/pom.xml

@@ -4,13 +4,13 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.qmth.teachcloud.common</groupId>
     <artifactId>teachcloud-common</artifactId>
-    <version>3.1.0</version>
+    <version>3.2.0</version>
     <packaging>jar</packaging>
 
     <parent>
         <groupId>com.qmth.distributed.print.service</groupId>
         <artifactId>distributed-print-service</artifactId>
-        <version>3.1.0</version>
+        <version>3.2.0</version>
     </parent>
 
     <dependencies>

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

@@ -35,8 +35,8 @@ public class SystemConstant {
      * 系统常量
      */
     public static final String CHARSET_NAME = "UTF-8";
-    public static final String CHARSET_GB2312= "gb2312";
-    public static final String CHARSET_GBK= "gbk";
+    public static final String CHARSET_GB2312 = "gb2312";
+    public static final String CHARSET_GBK = "gbk";
     public static final Charset CHARSET = Charset.forName(CHARSET_NAME);
     public static final String MD5 = "MD5";
     public static final String SUCCESS = "success";
@@ -287,7 +287,7 @@ public class SystemConstant {
         DictionaryConfig dictionaryConfig = SpringContextHolder.getBean(DictionaryConfig.class);
 
         if (Objects.nonNull(dictionaryConfig.sysDomain().getFileTempPath()) && !Objects.equals("", dictionaryConfig.sysDomain().getFileTempPath())) {
-            fileTempDir = new File(dictionaryConfig.sysDomain().getFileTempPath().toString());
+            fileTempDir = new File(dictionaryConfig.sysDomain().getFileTempPath().trim());
         } else {
             StringJoiner fileTempLocalPath = new StringJoiner("").add(System.getProperty(USER_DIR));
             String mkdir = fileTempLocalPath.toString().substring(0, fileTempLocalPath.toString().lastIndexOf(File.separator));
@@ -298,7 +298,7 @@ public class SystemConstant {
         }
 
         if (Objects.nonNull(dictionaryConfig.sysDomain().getPdfTempPath()) && !Objects.equals("", dictionaryConfig.sysDomain().getPdfTempPath())) {
-            pdfTempDir = new File(dictionaryConfig.sysDomain().getPdfTempPath().toString());
+            pdfTempDir = new File(dictionaryConfig.sysDomain().getPdfTempPath().trim());
         } else {
             StringJoiner pdfTempLocalPath = new StringJoiner("").add(System.getProperty(USER_DIR));
             String mkdir = pdfTempLocalPath.toString().substring(0, pdfTempLocalPath.toString().lastIndexOf(File.separator));
@@ -463,17 +463,17 @@ public class SystemConstant {
         return new DBVerifyResult(true, "成功");
     }
 
-    /**
-     * 获取流程学校code
-     *
-     * @return
-     */
-    public static Map<String, List<String>> getFlowSchoolCodeMap() {
-        DictionaryConfig dictionaryConfig = SpringContextHolder.getBean(DictionaryConfig.class);
-        Map<String, List<String>> flowSchoolCodeMap = dictionaryConfig.sysDomain().getFlowSchoolCodeMap();
-        Optional.ofNullable(flowSchoolCodeMap).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置学校流程code"));
-        return flowSchoolCodeMap;
-    }
+//    /**
+//     * 获取流程学校code
+//     *
+//     * @return
+//     */
+//    public static Map<String, List<String>> getFlowSchoolCodeMap() {
+//        DictionaryConfig dictionaryConfig = SpringContextHolder.getBean(DictionaryConfig.class);
+//        Map<String, List<String>> flowSchoolCodeMap = dictionaryConfig.sysDomain().getFlowSchoolCodeMap();
+//        Optional.ofNullable(flowSchoolCodeMap).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置学校流程code"));
+//        return flowSchoolCodeMap;
+//    }
 
     /**
      * 验证参数任意一个为空

teachcloud-common/src/main/java/com/qmth/teachcloud/common/domain/SysDomain.java

@@ -3,7 +3,6 @@ package com.qmth.teachcloud.common.domain;
 import java.io.Serializable;
 import java.time.Duration;
 import java.util.List;
-import java.util.Map;
 
 /**
  * @Description: 系统配置
@@ -24,10 +23,6 @@ public class SysDomain implements Serializable {
 
     String serverUpload;
 
-    String accessKey;
-
-    String accessSecret;
-
     String fileHost;
 
     String serverHost;
@@ -48,11 +43,11 @@ public class SysDomain implements Serializable {
 
     String loginAuthenUrl;
 
-    Map<String, List<String>> flowSchoolCodeMap;
+//    Map<String, List<String>> flowSchoolCodeMap;
 
-    public Map<String, List<String>> getFlowSchoolCodeMap() {
-        return flowSchoolCodeMap;
-    }
+//    public Map<String, List<String>> getFlowSchoolCodeMap() {
+//        return flowSchoolCodeMap;
+//    }
 
     String fileTempPath;
 
@@ -74,9 +69,9 @@ public class SysDomain implements Serializable {
         this.pdfTempPath = pdfTempPath;
     }
 
-    public void setFlowSchoolCodeMap(Map<String, List<String>> flowSchoolCodeMap) {
-        this.flowSchoolCodeMap = flowSchoolCodeMap;
-    }
+//    public void setFlowSchoolCodeMap(Map<String, List<String>> flowSchoolCodeMap) {
+//        this.flowSchoolCodeMap = flowSchoolCodeMap;
+//    }
 
     public String getLoginAuthenUrl() {
         return loginAuthenUrl;
@@ -174,22 +169,6 @@ public class SysDomain implements Serializable {
         this.attachmentSize = attachmentSize;
     }
 
-    public String getAccessKey() {
-        return accessKey;
-    }
-
-    public void setAccessKey(String accessKey) {
-        this.accessKey = accessKey;
-    }
-
-    public String getAccessSecret() {
-        return accessSecret;
-    }
-
-    public void setAccessSecret(String accessSecret) {
-        this.accessSecret = accessSecret;
-    }
-
     public boolean isOss() {
         return oss;
     }

teachcloud-common/src/main/java/com/qmth/teachcloud/common/entity/SysOrg.java

@@ -10,7 +10,6 @@ import com.qmth.teachcloud.common.enums.OrgTypeEnum;
 import io.swagger.annotations.ApiModelProperty;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 /**
@@ -36,7 +35,7 @@ public class SysOrg extends BaseEntity implements Serializable {
      */
     private String code;
 
-    @NotNull(message = "机构类型不能为空")
+//    @NotNull(message = "机构类型不能为空")
     @ApiModelProperty(value = "类型，COLLEGE：学院，FACULTY：院系，TEACHING_ROOM：教研室，PRINTING_HOUSE：印刷厂")
     private OrgTypeEnum type;
 
@@ -55,10 +54,10 @@ public class SysOrg extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "是否启用，0：停用，1：启用")
     private Boolean enable;
 
-    @ApiModelProperty(value = "校区id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    @TableField(exist = false)
-    private Long campusId;
+//    @ApiModelProperty(value = "校区id")
+//    @JsonSerialize(using = ToStringSerializer.class)
+//    @TableField(exist = false)
+//    private Long campusId;
 
     @ApiModelProperty("历史机构名")
     private String historicName;
@@ -83,13 +82,13 @@ public class SysOrg extends BaseEntity implements Serializable {
         this.historicName = historicName;
     }
 
-    public Long getCampusId() {
-        return campusId;
-    }
+//    public Long getCampusId() {
+//        return campusId;
+//    }
 
-    public void setCampusId(Long campusId) {
-        this.campusId = campusId;
-    }
+//    public void setCampusId(Long campusId) {
+//        this.campusId = campusId;
+//    }
 
     public static long getSerialVersionUID() {
         return serialVersionUID;

teachcloud-common/src/main/java/com/qmth/teachcloud/common/enums/OrgTypeEnum.java

@@ -13,11 +13,11 @@ public enum OrgTypeEnum {
 
     SCHOOL("学校"),
 
-    COLLEGE("学院"),
+//    COLLEGE("学院"),
 
-    FACULTY("院系"),
+//    FACULTY("院系"),
 
-    TEACHING_ROOM("教研室"),
+//    TEACHING_ROOM("教研室"),
 
     PRINTING_HOUSE("印刷厂"),
 

teachcloud-common/src/main/java/com/qmth/teachcloud/common/enums/RoleSourceEnum.java

@@ -10,7 +10,8 @@ import java.util.List;
 public enum RoleSourceEnum {
 
     SYS("系统自带"),
-    ANALYSIS("教研分析");
+    ANALYSIS("教研分析"),
+    CLOUD_MARK("云阅卷");
 
     RoleSourceEnum(String desc) {
         this.desc = desc;

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/CallApiOrgCenterService.java

@@ -1,20 +0,0 @@
-package com.qmth.teachcloud.common.service;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Description: 机构用户中心接口调用服务
- * @Author: CaoZixuan
- * @Date: 2021-04-02
- */
-public interface CallApiOrgCenterService {
-
-    /**
-     * 查询机构信息
-     * @return 机构信息（包含学校和合作方）
-     * @throws IOException 异常
-     */
-    List<Map> callOrgInfo() throws IOException;
-}

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

@@ -14,9 +14,11 @@ import com.qmth.teachcloud.common.bean.result.ClazzDatasourceResult;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.*;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
-import com.qmth.teachcloud.common.enums.OrgTypeEnum;
 import com.qmth.teachcloud.common.mapper.BasicCourseMapper;
-import com.qmth.teachcloud.common.service.*;
+import com.qmth.teachcloud.common.service.BasicClazzService;
+import com.qmth.teachcloud.common.service.BasicCourseService;
+import com.qmth.teachcloud.common.service.BasicUserCourseService;
+import com.qmth.teachcloud.common.service.TeachcloudCommonService;
 import com.qmth.teachcloud.common.util.ServletUtil;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -39,17 +41,21 @@ public class BasicCourseServiceImpl extends ServiceImpl<BasicCourseMapper, Basic
 
     @Resource
     private BasicCourseMapper basicCourseMapper;
+
     @Resource
     private TeachcloudCommonService teachcloudCommonService;
-    @Resource
-    private SysOrgService sysOrgService;
+
+//    @Resource
+//    private SysOrgService sysOrgService;
+
     @Resource
     private BasicUserCourseService basicUserCourseService;
+
     @Resource
     private BasicClazzService basicClazzService;
-    @Resource
-    private SysUserService sysUserService;
 
+//    @Resource
+//    private SysUserService sysUserService;
 
     @Override
     public List<BasicCourse> listCoursesByUserId(Long userId) {
@@ -81,8 +87,8 @@ public class BasicCourseServiceImpl extends ServiceImpl<BasicCourseMapper, Basic
 
     @Override
     public BasicCourse findByCourseCode(String courseCode, Long schoolId) {
-        BasicCourse basicCourse = this.getOne(new QueryWrapper<BasicCourse>().lambda().eq(BasicCourse::getCode, courseCode).eq(BasicCourse::getSchoolId,schoolId));
-        if (Objects.isNull(basicCourse)){
+        BasicCourse basicCourse = this.getOne(new QueryWrapper<BasicCourse>().lambda().eq(BasicCourse::getCode, courseCode).eq(BasicCourse::getSchoolId, schoolId));
+        if (Objects.isNull(basicCourse)) {
             throw ExceptionResultEnum.ERROR.exception("未找到课程编号为【" + courseCode + "】的基础课程");
         }
         return basicCourse;
@@ -190,25 +196,25 @@ public class BasicCourseServiceImpl extends ServiceImpl<BasicCourseMapper, Basic
     @Override
     public Boolean removeBasicCourseBatchByQuery(Long belongOrgId, String courseName, Long startCreateTime, Long endCreateTime, Boolean enable, Boolean enableOperate) {
         QueryWrapper<BasicCourse> basicCourseQueryWrapper = new QueryWrapper<>();
-        if (SystemConstant.longNotNull(belongOrgId)){
-            basicCourseQueryWrapper.lambda().eq(BasicCourse::getTeachingRoomId,belongOrgId);
+        if (SystemConstant.longNotNull(belongOrgId)) {
+            basicCourseQueryWrapper.lambda().eq(BasicCourse::getTeachingRoomId, belongOrgId);
         }
-        if (SystemConstant.strNotNull(courseName)){
-            basicCourseQueryWrapper.lambda().like(BasicCourse::getName,SystemConstant.translateSpecificSign(courseName));
+        if (SystemConstant.strNotNull(courseName)) {
+            basicCourseQueryWrapper.lambda().like(BasicCourse::getName, SystemConstant.translateSpecificSign(courseName));
         }
-        if (SystemConstant.longNotNull(startCreateTime)){
-            basicCourseQueryWrapper.lambda().ge(BasicCourse::getCreateTime,startCreateTime);
+        if (SystemConstant.longNotNull(startCreateTime)) {
+            basicCourseQueryWrapper.lambda().ge(BasicCourse::getCreateTime, startCreateTime);
         }
-        if (SystemConstant.longNotNull(endCreateTime)){
-            basicCourseQueryWrapper.lambda().le(BasicCourse::getCreateTime,endCreateTime);
+        if (SystemConstant.longNotNull(endCreateTime)) {
+            basicCourseQueryWrapper.lambda().le(BasicCourse::getCreateTime, endCreateTime);
         }
-        if (Objects.nonNull(enable)){
-            basicCourseQueryWrapper.lambda().eq(BasicCourse::getEnable,enable);
+        if (Objects.nonNull(enable)) {
+            basicCourseQueryWrapper.lambda().eq(BasicCourse::getEnable, enable);
         }
         List<BasicCourse> basicCourseList = this.list(basicCourseQueryWrapper);
         List<Long> idList = basicCourseList.stream().map(BaseEntity::getId).distinct().collect(Collectors.toList());
 
-        return idList.size() > 0 ? this.removeBasicCourseBatch(idList, enableOperate): true;
+        return idList.size() > 0 ? this.removeBasicCourseBatch(idList, enableOperate) : true;
     }
 
     @Transactional(rollbackFor = Exception.class)
@@ -231,17 +237,18 @@ public class BasicCourseServiceImpl extends ServiceImpl<BasicCourseMapper, Basic
                 String teachingRoomName = basicCourseImportDto.getTeachingRoomName();
                 String clazz = basicCourseImportDto.getClazz();
 
-                SysOrg sysOrg = sysOrgService.getOne(new QueryWrapper<SysOrg>().lambda()
-                        .eq(SysOrg::getSchoolId, schoolId)
-                        .eq(SysOrg::getEnable, true)
-                        .eq(SysOrg::getType, OrgTypeEnum.TEACHING_ROOM)
-                        .eq(SysOrg::getName, teachingRoomName));
+                SysOrg sysOrg = null;
+//                SysOrg sysOrg = sysOrgService.getOne(new QueryWrapper<SysOrg>().lambda()
+//                        .eq(SysOrg::getSchoolId, schoolId)
+//                        .eq(SysOrg::getEnable, true)
+//                        .eq(SysOrg::getType, OrgTypeEnum.TEACHING_ROOM)
+//                        .eq(SysOrg::getName, teachingRoomName));
                 if (Objects.isNull(sysOrg)) {
                     throw ExceptionResultEnum.ERROR.exception("输入的教研室【" + teachingRoomName + "】不存在");
                 }
                 Long teachingRoomId = sysOrg.getId();
                 LinkedHashSet<Long> clazzIdSet = new LinkedHashSet<>();
-                if (SystemConstant.strNotNull(clazz)){
+                if (SystemConstant.strNotNull(clazz)) {
                     String[] clazzList = clazz.split(SystemConstant.COMMA);
                     for (String clzName : clazzList) {
                         BasicClazz basicClazz = basicClazzService.getOne(new QueryWrapper<BasicClazz>().lambda()
@@ -316,12 +323,12 @@ public class BasicCourseServiceImpl extends ServiceImpl<BasicCourseMapper, Basic
             }
             // 校验教研室id
             Long teachingRoomId = basicCourseParams.getTeachingRoomId();
-            if (Objects.isNull(sysOrgService.getOne(new QueryWrapper<SysOrg>().lambda()
-                    .eq(SysOrg::getId, teachingRoomId)
-                    .eq(SysOrg::getEnable, true)
-                    .eq(SysOrg::getType, OrgTypeEnum.TEACHING_ROOM)))) {
-                throw ExceptionResultEnum.ERROR.exception("所选教研室不存在");
-            }
+//            if (Objects.isNull(sysOrgService.getOne(new QueryWrapper<SysOrg>().lambda()
+//                    .eq(SysOrg::getId, teachingRoomId)
+//                    .eq(SysOrg::getEnable, true)
+//                    .eq(SysOrg::getType, OrgTypeEnum.TEACHING_ROOM)))) {
+//                throw ExceptionResultEnum.ERROR.exception("所选教研室不存在");
+//            }
             // 校验班级
             Set<Long> clazzIdSet = basicCourseParams.getClazzIdSet();
 

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

@@ -16,7 +16,6 @@ import com.qmth.teachcloud.common.bean.result.BasicStudentResult;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.*;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
-import com.qmth.teachcloud.common.enums.OrgTypeEnum;
 import com.qmth.teachcloud.common.enums.TeachBasicEnum;
 import com.qmth.teachcloud.common.mapper.BasicStudentMapper;
 import com.qmth.teachcloud.common.service.*;
@@ -199,22 +198,22 @@ public class BasicStudentServiceImpl extends ServiceImpl<BasicStudentMapper, Bas
 
                 // 学院
                 Long collegeId = null;
-                if (SystemConstant.strNotNull(collegeName)) {
-                    SysOrg sysOrg;
-                    if (collegeMap.containsKey(collegeName)) {
-                        sysOrg = collegeMap.get(collegeName);
-                    } else {
-                        sysOrg = sysOrgService.getOne(new QueryWrapper<SysOrg>().lambda()
-                                .eq(SysOrg::getSchoolId, schoolId)
-                                .eq(SysOrg::getType, OrgTypeEnum.COLLEGE)
-                                .eq(SysOrg::getName, collegeName));
-                        if (Objects.isNull(sysOrg)) {
-                            throw ExceptionResultEnum.ERROR.exception("系统中不存在【学院】：" + collegeName);
-                        }
-                        collegeMap.put(collegeName, sysOrg);
-                    }
-                    collegeId = sysOrg.getId();
-                }
+//                if (SystemConstant.strNotNull(collegeName)) {
+//                    SysOrg sysOrg;
+//                    if (collegeMap.containsKey(collegeName)) {
+//                        sysOrg = collegeMap.get(collegeName);
+//                    } else {
+//                        sysOrg = sysOrgService.getOne(new QueryWrapper<SysOrg>().lambda()
+//                                .eq(SysOrg::getSchoolId, schoolId)
+//                                .eq(SysOrg::getType, OrgTypeEnum.COLLEGE)
+//                                .eq(SysOrg::getName, collegeName));
+//                        if (Objects.isNull(sysOrg)) {
+//                            throw ExceptionResultEnum.ERROR.exception("系统中不存在【学院】：" + collegeName);
+//                        }
+//                        collegeMap.put(collegeName, sysOrg);
+//                    }
+//                    collegeId = sysOrg.getId();
+//                }
 
                 // 专业
                 Long majorId = null;

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

@@ -1,72 +0,0 @@
-package com.qmth.teachcloud.common.service.impl;
-
-import com.alibaba.fastjson.JSONObject;
-import com.qmth.boot.tools.signature.SignatureEntity;
-import com.qmth.boot.tools.signature.SignatureType;
-import com.qmth.teachcloud.common.config.DictionaryConfig;
-import com.qmth.teachcloud.common.contant.SystemConstant;
-import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
-import com.qmth.teachcloud.common.service.CallApiOrgCenterService;
-import com.qmth.teachcloud.common.util.HttpUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
-import java.io.IOException;
-import java.util.*;
-
-/**
- * @Description: 机构用户中心接口调取服务实现类
- * @Author: CaoZixuan
- * @Date: 2021-03-26
- */
-@Service
-public class CallApiOrgCenterServiceImpl implements CallApiOrgCenterService {
-    @Resource
-    private DictionaryConfig dictionaryConfig;
-
-    private final static Logger log = LoggerFactory.getLogger(CallApiOrgCenterServiceImpl.class);
-
-    @Transactional(rollbackFor = Exception.class)
-    @Override
-    public List<Map> callOrgInfo() throws IOException {
-        List<Map> orgList = null;
-        if ((Objects.isNull(dictionaryConfig.sysDomain().getAccessKey()) || Objects.equals(dictionaryConfig.sysDomain().getAccessKey(), ""))
-                && (Objects.isNull(dictionaryConfig.sysDomain().getAccessSecret()) || Objects.equals(dictionaryConfig.sysDomain().getAccessSecret(), ""))) {
-            return orgList;
-        }
-        String url = dictionaryConfig.orgCenterDomain().getUrl() + dictionaryConfig.orgCenterDomain().getOrgQueryApi();
-
-        Map<String, Object> params = new HashMap<>();
-        int pageNumber = 1;
-        int pageSize = 100;
-
-        while (true) {
-            params.put("pageNumber", pageNumber);
-            params.put("pageSize", pageSize);
-            long timestamp = System.currentTimeMillis();
-            String accessToken = SignatureEntity.build(SignatureType.SECRET, SystemConstant.METHOD, dictionaryConfig.orgCenterDomain().getOrgQueryApi(), timestamp, dictionaryConfig.sysDomain().getAccessKey(), dictionaryConfig.sysDomain().getAccessSecret());
-            String result = HttpUtil.post(url, params, accessToken, timestamp);
-            if (Objects.nonNull(result)) {
-                if (result.contains("HTTP Status 401 – 未经授权的")) {
-                    throw ExceptionResultEnum.ERROR.exception("机构用户中心鉴权失败");
-                }
-                List<Map> tempList = JSONObject.parseArray(result, Map.class);
-                if (Objects.nonNull(tempList) && tempList.size() > 0) {
-                    if (Objects.isNull(orgList)) {
-                        orgList = new ArrayList<>();
-                    }
-                    orgList.addAll(tempList);
-                    pageNumber++;
-                } else {
-                    break;
-                }
-            } else {
-                break;
-            }
-        }
-        return orgList;
-    }
-}

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

@@ -1,14 +1,12 @@
 package com.qmth.teachcloud.common.service.impl;
 
 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.boot.api.exception.ApiException;
 import com.qmth.teachcloud.common.bean.dto.OrgDto;
 import com.qmth.teachcloud.common.bean.params.UserSaveParams;
 import com.qmth.teachcloud.common.bean.result.SysUserResult;
 import com.qmth.teachcloud.common.contant.SystemConstant;
-import com.qmth.teachcloud.common.entity.BasicCampus;
 import com.qmth.teachcloud.common.entity.SysOrg;
 import com.qmth.teachcloud.common.entity.SysRole;
 import com.qmth.teachcloud.common.entity.SysUser;
@@ -18,7 +16,10 @@ import com.qmth.teachcloud.common.enums.OrgTypeEnum;
 import com.qmth.teachcloud.common.enums.RoleTypeEnum;
 import com.qmth.teachcloud.common.enums.userPush.SpecialPrivilegeEnum;
 import com.qmth.teachcloud.common.mapper.SysOrgMapper;
-import com.qmth.teachcloud.common.service.*;
+import com.qmth.teachcloud.common.service.SysOrgService;
+import com.qmth.teachcloud.common.service.SysRoleService;
+import com.qmth.teachcloud.common.service.SysUserService;
+import com.qmth.teachcloud.common.service.TeachcloudCommonService;
 import com.qmth.teachcloud.common.util.ResultUtil;
 import com.qmth.teachcloud.common.util.ServletUtil;
 import org.apache.commons.collections4.CollectionUtils;
@@ -54,8 +55,8 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
     @Resource
     TeachcloudCommonService teachcloudCommonService;
 
-    @Resource
-    BasicCampusService basicCampusService;
+//    @Resource
+//    BasicCampusService basicCampusService;
 
     @Override
     public List<OrgDto> listOrgTree(SpecialPrivilegeEnum specialPrivilegeEnum) {
@@ -123,36 +124,36 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
             org.setSchoolId(schoolId);
             SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
 
-            QueryWrapper<SysOrg> queryWrapper = new QueryWrapper<>();
-            queryWrapper.lambda().eq(SysOrg::getSchoolId, org.getSchoolId()).eq(SysOrg::getParentId, org.getParentId()).eq(SysOrg::getCode, org.getCode());
-            SysOrg sysOrg = this.getOne(queryWrapper);
+//            QueryWrapper<SysOrg> queryWrapper = new QueryWrapper<>();
+//            queryWrapper.lambda().eq(SysOrg::getSchoolId, org.getSchoolId()).eq(SysOrg::getParentId, org.getParentId()));
+//            SysOrg sysOrg = this.getOne(queryWrapper);
 
             if (org.getId() == null) {// 新增
-                if (sysOrg != null) {
-                    throw ExceptionResultEnum.ERROR.exception("机构代码已存在");
-                }
-                checkOrgTree(org);
+//                if (sysOrg != null) {
+//                    throw ExceptionResultEnum.ERROR.exception("机构代码已存在");
+//                }
+//                checkOrgTree(org);
                 org.insertInfo(sysUser.getId());
                 success = this.save(org);
             } else { // 修改
-                if (sysOrg != null && org.getId().longValue() != sysOrg.getId().longValue()) {
-                    throw ExceptionResultEnum.ERROR.exception("机构代码已存在");
-                }
+//                if (sysOrg != null && org.getId().longValue() != sysOrg.getId().longValue()) {
+//                    throw ExceptionResultEnum.ERROR.exception("机构代码已存在");
+//                }
                 org.updateInfo(sysUser.getId());
                 success = this.updateById(org);
             }
-            if (Objects.nonNull(org.getCampusId())) {//更新校区
-                BasicCampus basicCampus = basicCampusService.getById(org.getCampusId());
-                if (Objects.nonNull(basicCampus) && Objects.nonNull(basicCampus.getPrintHouseId())
-                        && basicCampus.getPrintHouseId().longValue() != org.getId().longValue()) {
-                    throw ExceptionResultEnum.ERROR.exception("该校区已绑定其它印刷室");
-                }
-
-                UpdateWrapper<BasicCampus> basicCampusUpdateWrapper = new UpdateWrapper<>();
-                basicCampusUpdateWrapper.lambda().eq(BasicCampus::getId, org.getCampusId())
-                        .set(BasicCampus::getPrintHouseId, org.getId());
-                basicCampusService.update(basicCampusUpdateWrapper);
-            }
+//            if (Objects.nonNull(org.getCampusId())) {//更新校区
+//                BasicCampus basicCampus = basicCampusService.getById(org.getCampusId());
+//                if (Objects.nonNull(basicCampus) && Objects.nonNull(basicCampus.getPrintHouseId())
+//                        && basicCampus.getPrintHouseId().longValue() != org.getId().longValue()) {
+//                    throw ExceptionResultEnum.ERROR.exception("该校区已绑定其它印刷室");
+//                }
+//
+//                UpdateWrapper<BasicCampus> basicCampusUpdateWrapper = new UpdateWrapper<>();
+//                basicCampusUpdateWrapper.lambda().eq(BasicCampus::getId, org.getCampusId())
+//                        .set(BasicCampus::getPrintHouseId, org.getId());
+//                basicCampusService.update(basicCampusUpdateWrapper);
+//            }
         } catch (Exception e) {
             if (e instanceof DuplicateKeyException) {
                 String errorColumn = e.getCause().toString();
@@ -200,34 +201,34 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
         }
     }
 
-    /**
-     * 校验各机构关系
-     *
-     * @param org
-     */
-    private void checkOrgTree(SysOrg org) {
-        // 印刷厂不能设置子机构
-        if (Objects.nonNull(org.getParentId())) {
-            SysOrg parentOrg = this.getById(org.getParentId());
-            if (Objects.nonNull(parentOrg) && OrgTypeEnum.COLLEGE.equals(parentOrg.getType())) {
-                if (!OrgTypeEnum.FACULTY.equals(org.getType()) && !OrgTypeEnum.TEACHING_ROOM.equals(org.getType())) {
-                    throw ExceptionResultEnum.ERROR.exception("学院下只能设置院系或者教研室");
-                }
-            } else if (Objects.nonNull(parentOrg) && OrgTypeEnum.FACULTY.equals(parentOrg.getType())) {
-                if (!OrgTypeEnum.TEACHING_ROOM.equals(org.getType())) {
-                    throw ExceptionResultEnum.ERROR.exception("院系下只能设置教研室");
-                }
-            } else if (Objects.nonNull(parentOrg) && OrgTypeEnum.TEACHING_ROOM.equals(parentOrg.getType())) {
-                throw ExceptionResultEnum.ERROR.exception("教研室下不能设置子机构");
-            } else if (Objects.nonNull(parentOrg) && OrgTypeEnum.PRINTING_HOUSE.equals(parentOrg.getType())) {
-                throw ExceptionResultEnum.ERROR.exception("印刷厂不能设置子机构");
-            }
-        } else {
-            if (!OrgTypeEnum.COLLEGE.equals(org.getType()) && !OrgTypeEnum.PRINTING_HOUSE.equals(org.getType())) {
-                throw ExceptionResultEnum.ERROR.exception("一级机构只能设置学院或者印刷厂");
-            }
-        }
-    }
+//    /**
+//     * 校验各机构关系
+//     *
+//     * @param org
+//     */
+//    private void checkOrgTree(SysOrg org) {
+//        // 印刷厂不能设置子机构
+//        if (Objects.nonNull(org.getParentId())) {
+//            SysOrg parentOrg = this.getById(org.getParentId());
+//            if (Objects.nonNull(parentOrg) && OrgTypeEnum.COLLEGE.equals(parentOrg.getType())) {
+//                if (!OrgTypeEnum.FACULTY.equals(org.getType()) && !OrgTypeEnum.TEACHING_ROOM.equals(org.getType())) {
+//                    throw ExceptionResultEnum.ERROR.exception("学院下只能设置院系或者教研室");
+//                }
+//            } else if (Objects.nonNull(parentOrg) && OrgTypeEnum.FACULTY.equals(parentOrg.getType())) {
+//                if (!OrgTypeEnum.TEACHING_ROOM.equals(org.getType())) {
+//                    throw ExceptionResultEnum.ERROR.exception("院系下只能设置教研室");
+//                }
+//            } else if (Objects.nonNull(parentOrg) && OrgTypeEnum.TEACHING_ROOM.equals(parentOrg.getType())) {
+//                throw ExceptionResultEnum.ERROR.exception("教研室下不能设置子机构");
+//            } else if (Objects.nonNull(parentOrg) && OrgTypeEnum.PRINTING_HOUSE.equals(parentOrg.getType())) {
+//                throw ExceptionResultEnum.ERROR.exception("印刷厂不能设置子机构");
+//            }
+//        } else {
+//            if (!OrgTypeEnum.COLLEGE.equals(org.getType()) && !OrgTypeEnum.PRINTING_HOUSE.equals(org.getType())) {
+//                throw ExceptionResultEnum.ERROR.exception("一级机构只能设置学院或者印刷厂");
+//            }
+//        }
+//    }
 
     @Override
     public SysOrg findByForeignKey(Long schoolId, String collegeCode, String collegeName) {
@@ -500,12 +501,12 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
      * @return 新增后的机构id
      */
     private SysOrg saveOrgElement(Long parentId, String orgName, SysUser requestUser) {
-        SysOrg checkOrg = this.getOne(new QueryWrapper<SysOrg>().lambda().eq(SysOrg::getName,orgName).eq(SysOrg::getSchoolId,requestUser.getSchoolId()));
-        if (Objects.nonNull(checkOrg)){
+        SysOrg checkOrg = this.getOne(new QueryWrapper<SysOrg>().lambda().eq(SysOrg::getName, orgName).eq(SysOrg::getSchoolId, requestUser.getSchoolId()));
+        if (Objects.nonNull(checkOrg)) {
             // 数据库中存在该名字的机构
             SysOrg p1 = this.getById(checkOrg.getParentId());
             SysOrg p2 = this.getById(parentId);
-            if (SystemConstant.isOneNull(p1,p2)){
+            if (SystemConstant.isOneNull(p1, p2)) {
                 throw ExceptionResultEnum.ERROR.exception("未找到父机构");
             }
             throw ExceptionResultEnum.ERROR.exception("机构创建失败：机构【" + orgName + "】存在多个不同的上级机构 " +

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

@@ -127,12 +127,13 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
                 sysRoleService.updateById(role);
                 commonCacheService.updateRoleCache(role.getId());
                 if (count != sysRolePrivilegeList.size() || count != finalRelatedSet.size()) {
+                    //todo 云阅卷推送暂时去掉
                     // 删除权限前先更新涉及特殊权限用户 -> 需要重新同步
-                    List<SysRolePrivilege> dbRolePriList = commonCacheService.rolePrivilegeCache(role.getId());
-                    this.updateUserPushStats(dbRolePriList.stream().map(SysRolePrivilege::getPrivilegeId).distinct().collect(Collectors.toList()),
-                            Arrays.asList(role.getPrivilegeIds()),
-                            role.getId(),
-                            schoolId);
+//                    List<SysRolePrivilege> dbRolePriList = commonCacheService.rolePrivilegeCache(role.getId());
+//                    this.updateUserPushStats(dbRolePriList.stream().map(SysRolePrivilege::getPrivilegeId).distinct().collect(Collectors.toList()),
+//                            Arrays.asList(role.getPrivilegeIds()),
+//                            role.getId(),
+//                            schoolId);
                     sysRolePrivilegeService.removeByRoleId(role.getId());
                     sysRolePrivilegeService.saveBatch(role);//角色权限
                     commonCacheService.updateRolePrivilegeCache(role.getId());

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

@@ -14,7 +14,6 @@ import com.qmth.teachcloud.common.bean.dto.BlurryUserDto;
 import com.qmth.teachcloud.common.bean.dto.LoginDto;
 import com.qmth.teachcloud.common.bean.dto.UserDto;
 import com.qmth.teachcloud.common.bean.dto.VerifyCodeCheckDto;
-import com.qmth.teachcloud.common.bean.dto.excel.BasicStudentImportDto;
 import com.qmth.teachcloud.common.bean.dto.excel.DescribeImportDto;
 import com.qmth.teachcloud.common.bean.dto.excel.SysUserImportDto;
 import com.qmth.teachcloud.common.bean.params.ApproveUserResult;
@@ -148,11 +147,12 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         Long upUserId = saveUserCommon(userSaveParams, null);
         if (SystemConstant.longNotNull(upUserId)) {
             result = true;
-            List<PushUserTrack> pushUserTrackList = pushUserTrackService.createPushTrackUser(dbRoleIdSet, currentRoleIdSet, upUserId, this.getById(upUserId).getEnable(), requestUser.getId());
-            List<UserPushParam> userPushParamList = pushUserTrackService.analyzeUserPushSpecialPrivilege(pushUserTrackList);
-            if (userPushParamList != null && userPushParamList.size() > 0) {
-                this.userPushService(userPushParamList, requestUser.getId());
-            }
+            //todo 云阅卷推送暂时去掉
+//            List<PushUserTrack> pushUserTrackList = pushUserTrackService.createPushTrackUser(dbRoleIdSet, currentRoleIdSet, upUserId, this.getById(upUserId).getEnable(), requestUser.getId());
+//            List<UserPushParam> userPushParamList = pushUserTrackService.analyzeUserPushSpecialPrivilege(pushUserTrackList);
+//            if (userPushParamList != null && userPushParamList.size() > 0) {
+//                this.userPushService(userPushParamList, requestUser.getId());
+//            }
         }
         return result;
     }
@@ -911,32 +911,33 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     @Override
     public SpecialPrivilegeEnum findUserSpecialPrivilegeByRoleIdSet(Set<Long> roleIdSet) {
         SpecialPrivilegeEnum result = SpecialPrivilegeEnum.UNIDENTIFIED;
+        //TODO 评卷员科组长权限暂时去掉
         // 查询该学校特殊权限id
-        // 评卷员权限
-        SysPrivilege marker = sysPrivilegeService.list(new QueryWrapper<SysPrivilege>().lambda()
-                .eq(SysPrivilege::getUrl, SpecialPrivilegeEnum.MARKER.getId())).get(0);
-        Long markerId = marker.getId();
-
-        // 科组长权限
-        SysPrivilege subjectHeader = sysPrivilegeService.list(new QueryWrapper<SysPrivilege>().lambda()
-                .eq(SysPrivilege::getUrl, SpecialPrivilegeEnum.SUBJECT_HEADER.getId())).get(0);
-        Long subjectHeaderId = subjectHeader.getId();
-        if (roleIdSet.size() > 0) {
-            List<SysRolePrivilege> sysRolePrivilegeList = sysRolePrivilegeService.list(new QueryWrapper<SysRolePrivilege>().lambda().in(SysRolePrivilege::getRoleId, roleIdSet));
-            Set<Long> priIds = sysRolePrivilegeList.stream().map(SysRolePrivilege::getPrivilegeId).collect(Collectors.toSet());
-            if (priIds.size() > 0) {
-                if (priIds.contains(markerId) && !priIds.contains(subjectHeaderId)) {
-                    // 评卷员权限
-                    result = SpecialPrivilegeEnum.MARKER;
-                } else if (!priIds.contains(markerId) && priIds.contains(subjectHeaderId)) {
-                    // 科组长权限
-                    result = SpecialPrivilegeEnum.SUBJECT_HEADER;
-                } else if (priIds.contains(markerId) && priIds.contains(subjectHeaderId)) {
-                    // 复合权限
-                    result = SpecialPrivilegeEnum.COMPOSITE;
-                }
-            }
-        }
+//        // 评卷员权限
+//        SysPrivilege marker = sysPrivilegeService.list(new QueryWrapper<SysPrivilege>().lambda()
+//                .eq(SysPrivilege::getUrl, SpecialPrivilegeEnum.MARKER.getId())).get(0);
+//        Long markerId = marker.getId();
+//
+//        // 科组长权限
+//        SysPrivilege subjectHeader = sysPrivilegeService.list(new QueryWrapper<SysPrivilege>().lambda()
+//                .eq(SysPrivilege::getUrl, SpecialPrivilegeEnum.SUBJECT_HEADER.getId())).get(0);
+//        Long subjectHeaderId = subjectHeader.getId();
+//        if (roleIdSet.size() > 0) {
+//            List<SysRolePrivilege> sysRolePrivilegeList = sysRolePrivilegeService.list(new QueryWrapper<SysRolePrivilege>().lambda().in(SysRolePrivilege::getRoleId, roleIdSet));
+//            Set<Long> priIds = sysRolePrivilegeList.stream().map(SysRolePrivilege::getPrivilegeId).collect(Collectors.toSet());
+//            if (priIds.size() > 0) {
+//                if (priIds.contains(markerId) && !priIds.contains(subjectHeaderId)) {
+//                    // 评卷员权限
+//                    result = SpecialPrivilegeEnum.MARKER;
+//                } else if (!priIds.contains(markerId) && priIds.contains(subjectHeaderId)) {
+//                    // 科组长权限
+//                    result = SpecialPrivilegeEnum.SUBJECT_HEADER;
+//                } else if (priIds.contains(markerId) && priIds.contains(subjectHeaderId)) {
+//                    // 复合权限
+//                    result = SpecialPrivilegeEnum.COMPOSITE;
+//                }
+//            }
+//        }
         return result;
     }
 

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

@@ -26,6 +26,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.LinkedMultiValueMap;
 
 import javax.annotation.Resource;
@@ -378,54 +379,56 @@ public class TeachcloudCommonServiceImpl implements TeachcloudCommonService {
      */
     @Override
     public void removeUserInfoBatch(List<Long> userIds, boolean all) {
-        new Thread(() -> {
-            if (all) {
-                Set<String> sessionIdSet = new HashSet<>(Platform.values().length * userIds.size());
-                int min = 0;
-                int max = SystemConstant.IN_SIZE_MAX, size = userIds.size();
-                if (max >= size) {
-                    max = size;
-                }
-                while (max <= size) {
-                    List<UserRoleNameResult> userRoleNameResultList = sysUserService.selectRoleNames(userIds.subList(min, max));
-                    for (UserRoleNameResult userRoleNameResult : userRoleNameResultList) {
-                        List<String> roleNames = Arrays.asList(userRoleNameResult.getRoleNames().split(","));
-                        Collections.sort(roleNames);
-                        for (Platform p : Platform.values()) {
-                            String sessionId = null;
-                            try {
-                                sessionId = SessionUtil.digest(userRoleNameResult.getUserId(), Math.abs(roleNames.toString().hashCode()), p.name());
-                            } catch (NoSuchAlgorithmException e) {
-                                e.printStackTrace();
+        if (!CollectionUtils.isEmpty(userIds)) {
+            new Thread(() -> {
+                if (all) {
+                    Set<String> sessionIdSet = new HashSet<>(Platform.values().length * userIds.size());
+                    int min = 0;
+                    int max = SystemConstant.IN_SIZE_MAX, size = userIds.size();
+                    if (max >= size) {
+                        max = size;
+                    }
+                    while (max <= size) {
+                        List<UserRoleNameResult> userRoleNameResultList = sysUserService.selectRoleNames(userIds.subList(min, max));
+                        for (UserRoleNameResult userRoleNameResult : userRoleNameResultList) {
+                            List<String> roleNames = Arrays.asList(userRoleNameResult.getRoleNames().split(","));
+                            Collections.sort(roleNames);
+                            for (Platform p : Platform.values()) {
+                                String sessionId = null;
+                                try {
+                                    sessionId = SessionUtil.digest(userRoleNameResult.getUserId(), Math.abs(roleNames.toString().hashCode()), p.name());
+                                } catch (NoSuchAlgorithmException e) {
+                                    e.printStackTrace();
+                                }
+                                sessionIdSet.add(sessionId);
                             }
-                            sessionIdSet.add(sessionId);
+                        }
+                        if (max == size) {
+                            break;
+                        }
+                        min = max;
+                        max += SystemConstant.IN_SIZE_MAX;
+                        if (max >= size) {
+                            max = size;
                         }
                     }
-                    if (max == size) {
-                        break;
-                    }
-                    min = max;
-                    max += SystemConstant.IN_SIZE_MAX;
-                    if (max >= size) {
-                        max = size;
+                    tbSessionService.removeByIds(sessionIdSet);
+                    for (String s : sessionIdSet) {
+                        redisUtil.deleteUserSession(s);
                     }
+                } else {
+                    TBSession tbSession = (TBSession) ServletUtil.getRequestSession();
+                    tbSessionService.removeById(tbSession.getId());
+                    redisUtil.deleteUserSession(tbSession.getId());
                 }
-                tbSessionService.removeByIds(sessionIdSet);
-                for (String s : sessionIdSet) {
-                    redisUtil.deleteUserSession(s);
+                for (Long l : userIds) {
+                    commonCacheService.removeUserCache(l);
+                    commonCacheService.removeUserAuthCache(l);
+                    commonCacheService.removeUserMenuCache(l);
+                    commonCacheService.removeUserRolePrivilegeCache(l);
                 }
-            } else {
-                TBSession tbSession = (TBSession) ServletUtil.getRequestSession();
-                tbSessionService.removeById(tbSession.getId());
-                redisUtil.deleteUserSession(tbSession.getId());
-            }
-            for (Long l : userIds) {
-                commonCacheService.removeUserCache(l);
-                commonCacheService.removeUserAuthCache(l);
-                commonCacheService.removeUserMenuCache(l);
-                commonCacheService.removeUserRolePrivilegeCache(l);
-            }
-        }).start();
+            }).start();
+        }
     }
 
     /**

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

@@ -215,6 +215,7 @@
                     #{item}
                 </foreach>
             </if>
+            and sur.user_id > 1
         </where>
         group by sur.user_id
     </select>

teachcloud-report-business/pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.qmth.teachcloud.report.business</groupId>
     <artifactId>teachcloud-report-business</artifactId>
-    <version>3.1.0</version>
+    <version>3.2.0</version>
     <build>
         <plugins>
             <plugin>
@@ -22,7 +22,7 @@
     <parent>
         <groupId>com.qmth.distributed.print.service</groupId>
         <artifactId>distributed-print-service</artifactId>
-        <version>3.1.0</version>
+        <version>3.2.0</version>
     </parent>
 
     <dependencies>

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/templete/calculate/AsyncCalculateTaskTemplete.java

@@ -19,6 +19,6 @@ public abstract class AsyncCalculateTaskTemplete {
      * @return
      * @throws IOException
      */
-    @Async("taskThreadPool")
+    @Async
     public abstract Result calculateTask(Map<String, Object> map) throws IOException, Exception;
 }

teachcloud-report/pom.xml

@@ -4,13 +4,13 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.qmth.teachcloud.report</groupId>
 	<artifactId>teachcloud-report</artifactId>
-	<version>3.1.0</version>
+	<version>3.2.0</version>
 	<packaging>jar</packaging>
 
 	<parent>
 		<groupId>com.qmth.distributed.print.service</groupId>
 		<artifactId>distributed-print-service</artifactId>
-		<version>3.1.0</version>
+		<version>3.2.0</version>
 	</parent>
 
 	<dependencies>

teachcloud-report/src/main/resources/application-36dev.properties

@@ -36,16 +36,9 @@ sys.config.attachmentSize=200
 sys.config.serverUpload=
 sys.config.fileHost=localhost:7004
 sys.config.serverHost=localhost:7004
-#sys.config.accessKey=0bce69d94a7b4aef8bc0badf150351a9
-#sys.config.accessSecret=LdUwb5X4etmjW7fDn0KAdoXG0Yt7AkDu
-sys.config.accessKey=274f823e5f59410f8b3bb6edcd8e2b6e
-sys.config.accessSecret=y7AO6W0TOdTF8HpWBwGHbp3wfIHsmUKr
 sys.config.adminLogoUrl=http://qmth-test.oss-cn-shenzhen.aliyuncs.com/frontend/wx_logo.png
-#sys.config.htmlToPdfUrl=/usr/local/bin/wkhtmltopdf
-#sys.config.autoCreatePdfResetMaxCount=5
 sys.config.threadPoolCoreSize=1
 sys.config.customThreadPoolCoreSize=true
-sys.config.analyzeThreadPoolCoreSize=false
 sys.config.sessionActive=2h
 sys.config.reportUrl=http://localhost:9099/#/student-report/
 sys.config.loginAuthenUrl=http://192.168.10.86:8057/#/login-authen/

teachcloud-report/src/main/resources/application-dev.properties

@@ -36,16 +36,9 @@ sys.config.attachmentSize=200
 sys.config.serverUpload=
 sys.config.fileHost=http://localhost:7004
 sys.config.serverHost=http://localhost:7004
-#sys.config.accessKey=0bce69d94a7b4aef8bc0badf150351a9
-#sys.config.accessSecret=LdUwb5X4etmjW7fDn0KAdoXG0Yt7AkDu
-sys.config.accessKey=274f823e5f59410f8b3bb6edcd8e2b6e
-sys.config.accessSecret=y7AO6W0TOdTF8HpWBwGHbp3wfIHsmUKr
 sys.config.adminLogoUrl=http://qmth-test.oss-cn-shenzhen.aliyuncs.com/frontend/wx_logo.png
-#sys.config.htmlToPdfUrl=/usr/local/bin/wkhtmltopdf
-#sys.config.autoCreatePdfResetMaxCount=5
 sys.config.threadPoolCoreSize=1
 sys.config.customThreadPoolCoreSize=true
-sys.config.analyzeThreadPoolCoreSize=false
 sys.config.sessionActive=2h
 sys.config.reportUrl=http://localhost:9099/#/student-report/
 sys.config.loginAuthenUrl=http://127.0.0.1:8057/#/login-authen/

teachcloud-report/src/main/resources/application-offline.properties

@@ -36,16 +36,9 @@ sys.config.attachmentSize=200
 sys.config.serverUpload=
 sys.config.fileHost=http://192.168.10.136:7783
 sys.config.serverHost=http://192.168.10.136:7783
-#sys.config.accessKey=274f823e5f59410f8b3bb6edcd8e2b6e
-#sys.config.accessSecret=y7AO6W0TOdTF8HpWBwGHbp3wfIHsmUKr
-sys.config.accessKey=
-sys.config.accessSecret=
 sys.config.adminLogoUrl=http://qmth-test.oss-cn-shenzhen.aliyuncs.com/frontend/wx_logo.png
-#sys.config.htmlToPdfUrl=/usr/local/bin/wkhtmltopdf
-#sys.config.autoCreatePdfResetMaxCount=5
 sys.config.threadPoolCoreSize=1
 sys.config.customThreadPoolCoreSize=true
-sys.config.analyzeThreadPoolCoreSize=false
 sys.config.sessionActive=2h
 sys.config.reportUrl=http://192.168.10.136/#/student-report/
 sys.config.loginAuthenUrl=http://192.168.10.136/#/login-authen/

teachcloud-report/src/main/resources/application-test.properties

@@ -36,16 +36,9 @@ sys.config.attachmentSize=200
 sys.config.serverUpload=
 sys.config.fileHost=https://*.teachcloud-report-test.work
 sys.config.serverHost=https://*.teachcloud-report-test.work
-#sys.config.accessKey=274f823e5f59410f8b3bb6edcd8e2b6e
-#sys.config.accessSecret=y7AO6W0TOdTF8HpWBwGHbp3wfIHsmUKr
-sys.config.accessKey=
-sys.config.accessSecret=
 sys.config.adminLogoUrl=http://qmth-test.oss-cn-shenzhen.aliyuncs.com/frontend/wx_logo.png
-#sys.config.htmlToPdfUrl=/usr/local/bin/wkhtmltopdf
-#sys.config.autoCreatePdfResetMaxCount=5
 sys.config.threadPoolCoreSize=1
 sys.config.customThreadPoolCoreSize=true
-sys.config.analyzeThreadPoolCoreSize=false
 sys.config.sessionActive=2h
 sys.config.reportUrl=https://*.teachcloud-report-test.work/#/student-report/
 sys.config.loginAuthenUrl=https://*.teachcloud-report-test.work/#/login-authen/

teachcloud-task/pom.xml

@@ -4,13 +4,13 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.qmth.teachcloud.task</groupId>
     <artifactId>teachcloud-task</artifactId>
-    <version>3.1.0</version>
+    <version>3.2.0</version>
     <packaging>jar</packaging>
 
     <parent>
         <groupId>com.qmth.distributed.print.service</groupId>
         <artifactId>distributed-print-service</artifactId>
-        <version>3.1.0</version>
+        <version>3.2.0</version>
     </parent>
 
     <dependencies>

teachcloud-task/src/main/resources/application-task.properties

@@ -13,7 +13,7 @@ spring.application.name=teachcloud-task
 #\u6570\u636E\u6E90\u914D\u7F6E
 db.host=localhost
 db.port=3306
-db.name=distributed-v3.1.0
+db.name=distributed-v3.2.0
 db.username=root
 db.password=123456789
 
@@ -61,19 +61,12 @@ sys.config.attachmentSize=200
 sys.config.serverUpload=
 sys.config.fileHost=http://*.teachcloud-print-wl-test.cn
 sys.config.serverHost=http://*.teachcloud-print-wl-test.cn
-#sys.config.accessKey=0bce69d94a7b4aef8bc0badf150351a9
-#sys.config.accessSecret=LdUwb5X4etmjW7fDn0KAdoXG0Yt7AkDu
-sys.config.accessKey=274f823e5f59410f8b3bb6edcd8e2b6e
-sys.config.accessSecret=y7AO6W0TOdTF8HpWBwGHbp3wfIHsmUKr
 sys.config.adminLogoUrl=http://qmth-test.oss-cn-shenzhen.aliyuncs.com/frontend/wx_logo.png
 sys.config.htmlToPdfUrl=/usr/local/bin/wkhtmltopdf
-#sys.config.htmlToPdfUrl=E:/devUtils/wkhtmltopdf/bin/wkhtmltopdf.exe
 sys.config.autoCreatePdfResetMaxCount=5
 sys.config.threadPoolCoreSize=1
 sys.config.customThreadPoolCoreSize=true
 sys.config.sessionActive=4h
-sys.config.flowSchoolCodeMap.GdykdxPaperApprove=test-school-2
-sys.config.flowSchoolCodeMap.JxzyyPaperApprove=test-school-1
 spring.resources.static-locations=file:${sys.config.serverUpload},classpath:/META-INF/resources/,classpath:/resources/
 sys.config.fileTempPath=/Users/king/Downloads/file-temp
 sys.config.pdfTempPath=/Users/king/Downloads/pdf-temp

teachcloud-task/src/main/resources/application-task_36dev.properties

@@ -61,19 +61,12 @@ sys.config.attachmentSize=200
 sys.config.serverUpload=
 sys.config.fileHost=localhost:7871
 sys.config.serverHost=localhost:7871
-#sys.config.accessKey=0bce69d94a7b4aef8bc0badf150351a9
-#sys.config.accessSecret=LdUwb5X4etmjW7fDn0KAdoXG0Yt7AkDu
-sys.config.accessKey=274f823e5f59410f8b3bb6edcd8e2b6e
-sys.config.accessSecret=y7AO6W0TOdTF8HpWBwGHbp3wfIHsmUKr
 sys.config.adminLogoUrl=http://qmth-test.oss-cn-shenzhen.aliyuncs.com/frontend/wx_logo.png
-#sys.config.htmlToPdfUrl=/usr/local/bin/wkhtmltopdf
 sys.config.htmlToPdfUrl=/usr/local/bin/wkhtmltopdf
 sys.config.autoCreatePdfResetMaxCount=5
 sys.config.threadPoolCoreSize=1
 sys.config.customThreadPoolCoreSize=true
 sys.config.sessionActive=4h
-sys.config.flowSchoolCodeMap.GdykdxPaperApprove=test-school-2
-sys.config.flowSchoolCodeMap.JxzyyPaperApprove=test-school-1
 spring.resources.static-locations=file:${sys.config.serverUpload},classpath:/META-INF/resources/,classpath:/resources/
 sys.config.fileTempPath=/Users/king/Downloads/file-temp
 sys.config.pdfTempPath=/Users/king/Downloads/pdf-temp

teachcloud-task/src/main/resources/application-task_offline.properties

@@ -61,18 +61,12 @@ sys.config.attachmentSize=200
 sys.config.serverUpload=
 sys.config.fileHost=http://192.168.10.138:7781
 sys.config.serverHost=http://192.168.10.138:7781
-#sys.config.accessKey=0bce69d94a7b4aef8bc0badf150351a9
-#sys.config.accessSecret=LdUwb5X4etmjW7fDn0KAdoXG0Yt7AkDu
-sys.config.accessKey=918d0878ee7944beb448980b011ff804
-sys.config.accessSecret=IY3NB9FXtd7OQHWH5YHl6mbrU9ch33QC
 sys.config.adminLogoUrl=http://qmth-test.oss-cn-shenzhen.aliyuncs.com/frontend/wx_logo.png
 sys.config.htmlToPdfUrl=/usr/local/bin/wkhtmltopdf
 sys.config.autoCreatePdfResetMaxCount=5
 sys.config.threadPoolCoreSize=1
 sys.config.customThreadPoolCoreSize=false
 sys.config.sessionActive=4h
-sys.config.flowSchoolCodeMap.GdykdxPaperApprove=test-school-0
-sys.config.flowSchoolCodeMap.JxzyyPaperApprove=test-school-1,test-school-2
 spring.resources.static-locations=file:${sys.config.serverUpload},classpath:/META-INF/resources/,classpath:/resources/
 sys.config.fileTempPath=/file-temp
 sys.config.pdfTempPath=/pdf-temp

teachcloud-task/src/main/resources/application-task_test.properties

@@ -61,18 +61,12 @@ sys.config.attachmentSize=200
 sys.config.serverUpload=
 sys.config.fileHost=https://*.teach-cloud-test.com
 sys.config.serverHost=https://*.teach-cloud-test.com
-#sys.config.accessKey=0bce69d94a7b4aef8bc0badf150351a9
-#sys.config.accessSecret=LdUwb5X4etmjW7fDn0KAdoXG0Yt7AkDu
-sys.config.accessKey=918d0878ee7944beb448980b011ff804
-sys.config.accessSecret=IY3NB9FXtd7OQHWH5YHl6mbrU9ch33QC
 sys.config.adminLogoUrl=http://qmth-test.oss-cn-shenzhen.aliyuncs.com/frontend/wx_logo.png
 sys.config.htmlToPdfUrl=/usr/local/bin/wkhtmltopdf
 sys.config.autoCreatePdfResetMaxCount=5
 sys.config.threadPoolCoreSize=1
 sys.config.customThreadPoolCoreSize=false
 sys.config.sessionActive=4h
-sys.config.flowSchoolCodeMap.GdykdxPaperApprove=test-school-0
-sys.config.flowSchoolCodeMap.JxzyyPaperApprove=test-school-1,test-school-2
 spring.resources.static-locations=file:${sys.config.serverUpload},classpath:/META-INF/resources/,classpath:/resources/
 sys.config.fileTempPath=/Users/king/Downloads/file-temp
 sys.config.pdfTempPath=/Users/king/Downloads/pdf-temp