fix

src/main/java/cn/com/qmth/scancentral/enums/SystemMode.java

@@ -1,49 +0,0 @@
-package cn.com.qmth.scancentral.enums;
-
-public enum SystemMode {
-
-    MARKINGCLOUD("云阅卷"),
-
-    STANDALONE("独立"),
-
-    ;
-
-    private String name;
-
-    private static SystemMode current;
-
-    SystemMode(String name) {
-        this.name = name;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public static SystemMode getByName(String name) {
-        for (SystemMode r : SystemMode.values()) {
-            if (r.getName().equals(name)) {
-                return r;
-            }
-        }
-        return null;
-    }
-
-    public static SystemMode findByCode(String code) {
-        for (SystemMode m : SystemMode.values()) {
-            if (m.toString().equalsIgnoreCase(code)) {
-                return m;
-            }
-        }
-        return null;
-    }
-
-    public static void setCurrent(SystemMode mode) {
-        current = mode;
-    }
-
-    public static SystemMode current() {
-        return current;
-    }
-
-}

src/main/java/cn/com/qmth/scancentral/service/impl/ExamServiceImpl.java

@@ -369,9 +369,9 @@ public class ExamServiceImpl extends ServiceImpl<ExamDao, ExamEntity> implements
     @Transactional
     @Override
     public ExamEntity save(ImportExamDomain domain) {
-        if (SystemMode.MARKINGCLOUD.equals(SystemMode.current())) {
-            throw new ParameterException("非本地模式不支持此功能");
-        }
+        // if (SystemMode.MARKINGCLOUD.equals(SystemMode.current())) {
+        // throw new ParameterException("非本地模式不支持此功能");
+        // }
         if (domain.getAllowUnexistPaper() == null) {
             throw new ParameterException("AllowUnexistPaper 不能为空");
         }

src/main/java/cn/com/qmth/scancentral/service/impl/ExamSummaryServiceImpl.java

@@ -3,7 +3,6 @@ package cn.com.qmth.scancentral.service.impl;
 import cn.com.qmth.scancentral.dao.ExamSummaryDao;
 import cn.com.qmth.scancentral.entity.ExamEntity;
 import cn.com.qmth.scancentral.entity.ExamSummaryEntity;
-import cn.com.qmth.scancentral.enums.SystemMode;
 import cn.com.qmth.scancentral.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.slf4j.Logger;
@@ -43,18 +42,18 @@ public class ExamSummaryServiceImpl extends ServiceImpl<ExamSummaryDao, ExamSumm
     @Transactional
     public ExamSummaryEntity find(Long examId) {
         // 独立模式下优先取定时计算结果
-        if (SystemMode.current() == SystemMode.STANDALONE) {
-            ExamSummaryEntity es = getById(examId);
-            if (es == null) {
-                es = build(examId);
-                saveOrUpdate(es);
-            }
-            return es;
-        }
-        // 云阅卷模式下每次实时计算
-        else {
-            return build(examId);
+        // if (SystemMode.current() == SystemMode.STANDALONE) {
+        ExamSummaryEntity es = getById(examId);
+        if (es == null) {
+            es = build(examId);
+            saveOrUpdate(es);
         }
+        return es;
+        // }
+        // // 云阅卷模式下每次实时计算
+        // else {
+        // return build(examId);
+        // }
     }
 
     private ExamSummaryEntity build(Long examId) {
@@ -75,9 +74,9 @@ public class ExamSummaryServiceImpl extends ServiceImpl<ExamSummaryDao, ExamSumm
     @Scheduled(cron = "0/60 * * * * ?")
     public void cronRefresh() {
         // 只有独立模式下开启定时刷新
-        if (SystemMode.MARKINGCLOUD.equals(SystemMode.current())) {
-            return;
-        }
+        // if (SystemMode.MARKINGCLOUD.equals(SystemMode.current())) {
+        // return;
+        // }
         List<ExamEntity> list = examService.listEnable();
         for (ExamEntity exam : list) {
             log.info("ExamSummaryJob running for examId={}", exam.getId());

src/main/java/cn/com/qmth/scancentral/service/impl/PictureCopyServiceImpl.java

@@ -1,7 +1,6 @@
 package cn.com.qmth.scancentral.service.impl;
 
 import cn.com.qmth.scancentral.consumer.PictureCopyConsumer;
-import cn.com.qmth.scancentral.enums.SystemMode;
 import cn.com.qmth.scancentral.service.PictureCopyService;
 import cn.com.qmth.scancentral.service.StudentService;
 import cn.com.qmth.scancentral.support.SpringContextHolder;
@@ -25,9 +24,6 @@ public class PictureCopyServiceImpl implements PictureCopyService {
 
     @Override
     public void copy() {
-        if (!SystemMode.STANDALONE.equals(SystemMode.current())) {
-            return;
-        }
         ExecutorService ex = null;
         try {
             int count = Math.min(5, Runtime.getRuntime().availableProcessors() * 2);

src/main/java/cn/com/qmth/scancentral/service/impl/SessionServiceImpl.java

@@ -4,7 +4,6 @@ import cn.com.qmth.scancentral.bean.SchoolSession;
 import cn.com.qmth.scancentral.bean.User;
 import cn.com.qmth.scancentral.config.SysProperty;
 import cn.com.qmth.scancentral.enums.Role;
-import cn.com.qmth.scancentral.enums.SystemMode;
 import cn.com.qmth.scancentral.service.SessionService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -53,23 +52,24 @@ public class SessionServiceImpl implements SessionService {
     @Override
     public void userLogin(User user) {
         updateUserSession(user);
-        if (SystemMode.MARKINGCLOUD.equals(SystemMode.current())) {
-            if (Role.SCAN_ADMIN.equals(user.getRole()) || Role.SCHOOL_ADMIN.equals(user.getRole())) {
-                updateSchoolSession(user);
-            }
-        }
-    }
-
-    private void updateSchoolSession(User user) {
-        // SchoolSession s = schoolSessionData.get(user.getSchoolId());
-        // if (s == null) {
-        // schoolSessionData.put(user.getSchoolId(), SchoolSession.of(user));
-        // } else if (Role.SCAN_ADMIN.equals(s.getRole()) ||
+        // if (SystemMode.MARKINGCLOUD.equals(SystemMode.current())) {
+        // if (Role.SCAN_ADMIN.equals(user.getRole()) ||
         // Role.SCHOOL_ADMIN.equals(user.getRole())) {
-        // schoolSessionData.put(user.getSchoolId(), SchoolSession.of(user));
+        // updateSchoolSession(user);
+        // }
         // }
     }
 
+    // private void updateSchoolSession(User user) {
+    // SchoolSession s = schoolSessionData.get(user.getSchoolId());
+    // if (s == null) {
+    // schoolSessionData.put(user.getSchoolId(), SchoolSession.of(user));
+    // } else if (Role.SCAN_ADMIN.equals(s.getRole()) ||
+    // Role.SCHOOL_ADMIN.equals(user.getRole())) {
+    // schoolSessionData.put(user.getSchoolId(), SchoolSession.of(user));
+    // }
+    // }
+
     @Override
     public void removeSchoolSession(Long schoolId) {
         schoolSessionData.remove(schoolId);

src/main/java/cn/com/qmth/scancentral/service/impl/ToolExportServiceImpl.java

@@ -52,8 +52,8 @@ public class ToolExportServiceImpl implements ToolExportService {
     @Autowired
     private StudentService studentService;
 
-    @Autowired
-    private SystemConfigService systemConfigService;
+    // @Autowired
+    // private SystemConfigService systemConfigService;
 
     @Autowired
     private SysProperty sysProperty;
@@ -185,13 +185,13 @@ public class ToolExportServiceImpl implements ToolExportService {
 
     @Override
     public void studentFileCopy(Long studentId, ImageTransferMode imageTransferMode) {
-        SystemConfigEntity config = systemConfigService.find();
-        if (config == null) {
-            throw new StatusException("未找到系统配置");
-        }
-        if (!SystemMode.STANDALONE.equals(SystemMode.current())) {
-            throw new StatusException("系统配置非独立模式");
-        }
+        // SystemConfigEntity config = systemConfigService.find();
+        // if (config == null) {
+        // throw new StatusException("未找到系统配置");
+        // }
+        // if (!SystemMode.STANDALONE.equals(SystemMode.current())) {
+        // throw new StatusException("系统配置非独立模式");
+        // }
         StudentEntity student = studentService.getById(studentId);
         if (student == null) {
             throw new StatusException("未找到考生");

src/main/java/cn/com/qmth/scancentral/service/impl/UploadServiceImpl.java

@@ -2,7 +2,6 @@ package cn.com.qmth.scancentral.service.impl;
 
 import cn.com.qmth.scancentral.bean.SchoolSession;
 import cn.com.qmth.scancentral.consumer.UploadConsumer;
-import cn.com.qmth.scancentral.enums.SystemMode;
 import cn.com.qmth.scancentral.service.SessionService;
 import cn.com.qmth.scancentral.service.StudentService;
 import cn.com.qmth.scancentral.service.UploadService;
@@ -31,9 +30,9 @@ public class UploadServiceImpl implements UploadService {
 
     @Override
     public void upload() {
-        if (!SystemMode.MARKINGCLOUD.equals(SystemMode.current())) {
-            return;
-        }
+        // if (!SystemMode.MARKINGCLOUD.equals(SystemMode.current())) {
+        // return;
+        // }
         ExecutorService ex = null;
         try {
             Collection<SchoolSession> sss = sessionService.getSchoolSessions();