From 25c2526eb541a2e1872776feef9f13218d0ef820 Mon Sep 17 00:00:00 2001
From: Mlxa0324 <mlx950324@163.com>
Date: Tue, 6 Dec 2022 17:48:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0=E8=AF=95?=
 =?UTF-8?q?=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/jlw/Interceptor/GetFile.java | 41 ++++++++++++++++---
 ...acherOpenCourseQuestionSettingService.java | 18 ++++----
 2 files changed, 45 insertions(+), 14 deletions(-)

diff --git a/web/src/main/java/cn/jlw/Interceptor/GetFile.java b/web/src/main/java/cn/jlw/Interceptor/GetFile.java
index a13541bf..ce2b299a 100644
--- a/web/src/main/java/cn/jlw/Interceptor/GetFile.java
+++ b/web/src/main/java/cn/jlw/Interceptor/GetFile.java
@@ -24,18 +24,18 @@ import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.Part;
 import java.io.File;
+import java.io.IOException;
 import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.concurrent.atomic.AtomicLong;
 
+import static cn.jlw.util.CacheUserUtil.checkSession;
 import static com.ibeetl.admin.core.service.CorePlatformService.T_STUDENT;
 
 //将从request中获取的file获取出来并存入临时文件夹中
@@ -127,8 +127,39 @@ public class GetFile implements HandlerMethodArgumentResolver {
     }
 
 
+    public Object resolveArgument2(MethodParameter parameter, ModelAndViewContainer mavContainer, NativeWebRequest webRequest, WebDataBinderFactory binderFactory) throws Exception {
+        RFile rFile = parameter.getParameterAnnotation(RFile.class);
+        List<FileEntity> fileEntityList = new ArrayList<>();
+        HttpServletRequest request = webRequest.getNativeRequest(HttpServletRequest.class);
+        checkSession();
+
+        Collection<Part> requestParts = request.getParts();
+        requestParts.forEach(part -> {
+            String name = part.getName();
+            try {
+                part.getInputStream();
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+        });
+        return fileEntityList;
+    }
+
+
+    /**
+     * 功能描述: <br>
+     * 暂时先注释掉老的上传方法。
+     *
+     * @param parameter
+     * @param mavContainer
+     * @param webRequest
+     * @param binderFactory
+     * @return {@link Object}
+     * @Author: 87966
+     * @Date: 2022/12/6 17:37
+     */
     @Override
-    public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer, NativeWebRequest webRequest, WebDataBinderFactory binderFactory) throws Exception {
+        public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer, NativeWebRequest webRequest, WebDataBinderFactory binderFactory) throws Exception {
         RFile rFile = parameter.getParameterAnnotation(RFile.class);
 
         List<FileEntity> fileEntityList = new ArrayList<>();
diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionSettingService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionSettingService.java
index 1ed06fe6..352275ec 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionSettingService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionSettingService.java
@@ -254,17 +254,17 @@ public class TeacherOpenCourseQuestionSettingService extends CoreBaseService<Tea
                 logSummaryQuery.setPersonId(studentId);
                 logSummaryQuery.setQuestionLogSummaryStatus(1);
                 logSummaryQuery.setQuestionSettingId(questionSettingId);
-                List<QuestionLogSummary> logSummaryList = questionLogSummaryDao.getValuesByQueryNotWithPermission(logSummaryQuery);
+                List<QuestionLogSummary> myLogSummaryList = questionLogSummaryDao.getValuesByQueryNotWithPermission(logSummaryQuery);
 
                 // 我的得分，完成时间
-                if (ObjectUtil.isNotEmpty(logSummaryList)) {
-                    QuestionLogSummary scoreInfo = logSummaryList.get(0);
-                    item.set("finishTime", scoreInfo.getFinishTime());
-                    item.set("finishSecondTime", scoreInfo.getFinishSecondTime());
-                    item.set("myScore", scoreInfo.getQuestionLogSummaryStudentTotalScore());
-                    item.set("mySuccessRate", scoreInfo.getQuestionLogSummarySuccessRate());
-                    item.set("mySuccessCount", scoreInfo.getQuestionLogSummarySuccessCount());
-                    item.set("myErrorCount", scoreInfo.getQuestionLogSummaryErrorCount());
+                if (ObjectUtil.isNotEmpty(myLogSummaryList)) {
+                    QuestionLogSummary myScoreInfo = myLogSummaryList.get(0);
+                    item.set("finishTime", myScoreInfo.getFinishTime());
+                    item.set("finishSecondTime", myScoreInfo.getFinishSecondTime());
+                    item.set("myScore", myScoreInfo.getQuestionLogSummaryStudentTotalScore());
+                    item.set("mySuccessRate", myScoreInfo.getQuestionLogSummarySuccessRate());
+                    item.set("mySuccessCount", myScoreInfo.getQuestionLogSummarySuccessCount());
+                    item.set("myErrorCount", myScoreInfo.getQuestionLogSummaryErrorCount());
                 }
             }