代码优化

file-server/src/main/java/com/qmth/file/exception/FileServerException.java

@@ -58,6 +58,7 @@ public class FileServerException extends RuntimeException {
         return code;
     }
 
+    @Override
     public String getMessage() {
         return message;
     }

server/src/main/java/com/qmth/jkserver/core/cache/MemoryCacheDao.java

@@ -1,19 +1,19 @@
 package com.qmth.jkserver.core.cache;
 
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Repository;
 
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+
 @Repository("memoryCacheDao")
 public class MemoryCacheDao {
-	
-	private static final Logger LOGGER = LoggerFactory.getLogger(MemoryCacheDao.class);
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(MemoryCacheDao.class);
 
     private static ConcurrentHashMap<String, Long> cacheTime = new ConcurrentHashMap<String, Long>();// 缓存到期时间
 
@@ -24,32 +24,31 @@ public class MemoryCacheDao {
     private static ConcurrentHashMap<String, String> stringCache = new ConcurrentHashMap<String, String>();// 缓存
 
     //清理过期的缓存
-    public static void chean(){
-    	Set<String> expiredKeys = new HashSet<>();//已经过期的key
-    	for (String key : cacheTime.keySet()) {
-    		  if (cacheTime.get(key) != null && cacheTime.get(key) < System.currentTimeMillis()) {
-    			  expiredKeys.add(key);
-    		  }
-    	}
-    	for (String key : expiredKeys) {
-    		if(key.indexOf("_")>-1){
-    			for (String m: objectMapCache.keySet()) {
-    				for (String field: objectMapCache.get(m).keySet()) {
-    					if((key+"_"+field).equals(key)){
-    						objectMapCache.remove(key);
-    					}
-    				}
-    			}
-    		}
-    		else{
-    			cacheTime.remove(key);
-    			objectCache.remove(key);
-    			stringCache.remove(key);
-    		}
-    		LOGGER.info("---成功清理缓存,KEY="+key+"----------------------------------------");
-    	}
+    public static void chean() {
+        Set<String> expiredKeys = new HashSet<>();//已经过期的key
+        for (String key : cacheTime.keySet()) {
+            if (cacheTime.get(key) != null && cacheTime.get(key) < System.currentTimeMillis()) {
+                expiredKeys.add(key);
+            }
+        }
+        for (String key : expiredKeys) {
+            if (key.indexOf("_") > -1) {
+                for (String m : objectMapCache.keySet()) {
+                    for (String field : objectMapCache.get(m).keySet()) {
+                        if ((key + "_" + field).equals(key)) {
+                            objectMapCache.remove(key);
+                        }
+                    }
+                }
+            } else {
+                cacheTime.remove(key);
+                objectCache.remove(key);
+                stringCache.remove(key);
+            }
+            LOGGER.info("---成功清理缓存,KEY=" + key + "----------------------------------------");
+        }
     }
-    
+
     public String getStr(String key) {
         // 缓存过期
         if (cacheTime.get(key) != null && cacheTime.get(key) < System.currentTimeMillis()) {
@@ -78,24 +77,24 @@ public class MemoryCacheDao {
 
     public Object getObj(String key, String field) {
         // 缓存过期
-    	if(StringUtils.isNotEmpty(field)){
-    		if (cacheTime.get(key + "_" + field) != null && cacheTime.get(key + "_" + field) < System.currentTimeMillis()) {
-    			return null;
-    		}
-    		if (objectMapCache.containsKey(key)) {
-    			return objectMapCache.get(key).get(field);
-    		}
-    	}
-    	else{
-    		return objectMapCache.get(key);
-    	}
+        if (StringUtils.isNotEmpty(field)) {
+            if (cacheTime.get(key + "_" + field) != null && cacheTime.get(key + "_" + field) < System.currentTimeMillis()) {
+                return null;
+            }
+            if (objectMapCache.containsKey(key)) {
+                return objectMapCache.get(key).get(field);
+            }
+        } else {
+            return objectMapCache.get(key);
+        }
         return null;
     }
 
     public boolean setObj(String key, Object value, int expireTime) { //单位是秒
         // 如果为-1，存储一年
-        if (expireTime == -1)
+        if (expireTime == -1) {
             expireTime = 360 * 24 * 60 * 60;
+        }
         objectCache.put(key, value);
         cacheTime.put(key, System.currentTimeMillis() + expireTime * 1000);
         return true;

server/src/main/java/com/qmth/jkserver/core/exception/ApiException.java

@@ -48,6 +48,7 @@ public class ApiException extends RuntimeException {
         return code;
     }
 
+    @Override
     public String getMessage() {
         return message;
     }

server/src/main/java/com/qmth/jkserver/core/exception/JkServerException.java

@@ -47,6 +47,7 @@ public class JkServerException extends RuntimeException {
         return code;
     }
 
+    @Override
     public String getMessage() {
         return message;
     }

server/src/main/java/com/qmth/jkserver/core/kj/IKjValidateAndStore.java

@@ -5,17 +5,17 @@ import com.qmth.jkserver.enums.ProgressType;
 /**
  * 考试结果数据校验
  * 校验成功返回考试结果对象
- * @author tianjun
  *
+ * @author tianjun
  */
 public interface IKjValidateAndStore {
-	
-	/**
-	 * 
-	 * @param examCode 		考试识别码
-	 * @param encrypted		监考端上传的原始文件的ID
-	 * @return		校验通过的考试数据
-	 */
-	public void execute(ProgressType type) throws Exception;
+
+    /**
+     * 校验通过的考试数据
+     *
+     * @param type
+     * @throws Exception
+     */
+    public void execute(ProgressType type) throws Exception;
 
 }

server/src/main/java/com/qmth/jkserver/service/impl/ExamKwHZServiceImpl.java

@@ -11,7 +11,6 @@ import com.qmth.jkserver.dto.ExamStudentCountDto;
 import com.qmth.jkserver.model.*;
 import com.qmth.jkserver.service.*;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.context.annotation.Lazy;
 import org.springframework.context.annotation.Scope;
 import org.springframework.context.annotation.ScopedProxyMode;
 import org.springframework.data.domain.Page;
@@ -55,10 +54,6 @@ public class ExamKwHZServiceImpl implements ExamKwHZService {
     @Resource
     ExamRepeatRecordDao examRepeatRecordDao;
 
-    @Resource
-    @Lazy
-    ExamStudentService examStudentService;
-
     @Override
     public Page<ExamStudentCountDto> statisticKwHZDetails(String code, String batchId,
                                                           String placeCode, String placeName, String roomCode, Integer pageNo, Integer pageSize) {

server/src/main/java/com/qmth/jkserver/service/impl/ExamProgressStatisticServiceImpl.java

@@ -2,7 +2,6 @@ package com.qmth.jkserver.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.qmth.jkserver.common.Constants;
 import com.qmth.jkserver.constant.SystemConstant;
 import com.qmth.jkserver.core.cache.JkCacheService;
 import com.qmth.jkserver.core.exception.JkServerException;
@@ -14,7 +13,10 @@ import com.qmth.jkserver.enums.BlurryQueryTypeEnum;
 import com.qmth.jkserver.enums.ExamConditionEnum;
 import com.qmth.jkserver.enums.ExamFinishStatusEnum;
 import com.qmth.jkserver.enums.RegistrationStatusEnum;
-import com.qmth.jkserver.model.*;
+import com.qmth.jkserver.model.ExamPlan;
+import com.qmth.jkserver.model.ExamRoom;
+import com.qmth.jkserver.model.ExamStage;
+import com.qmth.jkserver.model.ExamStudent;
 import com.qmth.jkserver.service.*;
 import com.qmth.jkserver.util.BlurryQueryUtil;
 import com.qmth.jkserver.util.ServletUtil;
@@ -216,6 +218,8 @@ public class ExamProgressStatisticServiceImpl implements ExamProgressStatisticSe
                         .flatMap(e -> Stream.of(new QueryResultDto(null, e.name(), e.getDesc(), examConditionEnum)))
                         .collect(Collectors.toList());
                 break;
+            default:
+                break;
         }
         return queryResultDtoList;
     }
@@ -311,6 +315,8 @@ public class ExamProgressStatisticServiceImpl implements ExamProgressStatisticSe
                     examStudentQueryWrapper.lambda().and(i -> i.eq(ExamStudent::getExamFinishStatus, examFinishStatus)
                             .or().isNull(ExamStudent::getExamFinishStatus));
                     break;
+                default:
+                    break;
             }
         }
         // 关键字查询

server/src/main/java/com/qmth/jkserver/util/ExcelUtil.java

@@ -278,6 +278,8 @@ public class ExcelUtil {
                 return cell.getBooleanCellValue();
             case ERROR:
                 return cell.getErrorCellValue();
+            default:
+                break;
         }
         return null;
     }