diff --git a/AES-front/src/api/user.js b/AES-front/src/api/user.js index 4638c04..ccb2a3d 100644 --- a/AES-front/src/api/user.js +++ b/AES-front/src/api/user.js @@ -34,6 +34,21 @@ export default { getPostProblemInfo:(config) => request.get('/problem/getPostProblemInfo', config),//获取当前报告布置信息 - findProblemById1:(config)=>request.get('/problem/findProblemById1',config)//获取当前报告具体信息 + findProblemById1:(config)=>request.get('/problem/findProblemById1',config),//获取当前报告具体信息 + getSubmitReport:(config) => request.get('/problem/getSubmitReport', config),//获取学生已上传报告信息 + + //文件处理部分 + uploadFiles: (data) => + request({ + url: '/importClassStudentsFile/uploadFiles', + method: 'post', + data: data, + }), //学生上传文件 + + downloadFile: (fileName) => + request({ + url: `/downloadFile/downloadFile/${fileName}`, + method: 'get', + }), // 文件下载 } diff --git a/AES-front/src/views/user/report-submit/components/leftparts.vue b/AES-front/src/views/user/report-submit/components/leftparts.vue index 6635036..18fae11 100644 --- a/AES-front/src/views/user/report-submit/components/leftparts.vue +++ b/AES-front/src/views/user/report-submit/components/leftparts.vue @@ -12,29 +12,59 @@
瀹為獙鎻愪氦
- - 涓婁紶闄勪欢 - +
+ 涓婁紶闄勪欢 +
+ 宸蹭笂浼犳枃浠讹細 + +
+ + + + + +
灏嗘枃浠舵嫋鍒版澶勶紝鎴鐐瑰嚮涓婁紶
+ + + 鍙栨秷 + 纭畾 + + + + + \ No newline at end of file diff --git a/AES-front/src/views/user/report-submit/components/report-actions.vue b/AES-front/src/views/user/report-submit/components/report-actions.vue index 0ab4a4e..0e18981 100644 --- a/AES-front/src/views/user/report-submit/components/report-actions.vue +++ b/AES-front/src/views/user/report-submit/components/report-actions.vue @@ -1,8 +1,8 @@ diff --git a/AES-front/src/views/user/report-submit/components/rightparts.vue b/AES-front/src/views/user/report-submit/components/rightparts.vue index b8f0c42..ceb56ef 100644 --- a/AES-front/src/views/user/report-submit/components/rightparts.vue +++ b/AES-front/src/views/user/report-submit/components/rightparts.vue @@ -27,7 +27,7 @@ const plagiarismStatus = ref(0); // 鍒濆鍖栨妱琚姸鎬 const getJudgeInfo = async () => { // 鏌ヨ鎵归槄鐩稿叧淇℃伅 try { - const res = await api.getStudentRank({ params: { examId } }); + const res = await api.getSubmitReport({ params: { examId } }); comment.value = res.data.comment; // 鏇存柊鏁欏笀璇勮 plagiarismStatus.value = res.data.plagiarismStatus; // 鏇存柊鎶勮鐘舵 } catch (error) { diff --git a/AES-front/src/views/user/report-submit/index.vue b/AES-front/src/views/user/report-submit/index.vue index a566ff2..fcc365c 100644 --- a/AES-front/src/views/user/report-submit/index.vue +++ b/AES-front/src/views/user/report-submit/index.vue @@ -14,21 +14,20 @@ - diff --git a/AES-front/src/views/user/score-rank/components/personal-rank.vue b/AES-front/src/views/user/score-rank/components/personal-rank.vue index 96bc2cf..aa77a88 100644 --- a/AES-front/src/views/user/score-rank/components/personal-rank.vue +++ b/AES-front/src/views/user/score-rank/components/personal-rank.vue @@ -20,7 +20,7 @@ const examId = route.params.examId; const classId = route.params.classId; const title = ref(""); // 浠嶢PI鑾峰彇鐨勪綔涓氬悕绉 const score = ref(0); // 涓汉寰楀垎 -const rank = ref(0); // 涓汉鎺掑悕 +const rank = ref("-"); // 涓汉鎺掑悕锛岄粯璁や负 "-" const totalStudents = ref(0); // 鐝骇鎬讳汉鏁 const paginationReactive = reactive({ @@ -53,18 +53,20 @@ const queryExamScores = async () => { const res = await api.getStudentRank({ params: { examId } }); + title.value = res.data.title; // 鏇存柊浣滀笟鍚嶇О + score.value = res.data.score; // 鏇存柊涓汉寰楀垎 + rank.value = res.data.rank || "-"; // 鏇存柊涓汉鎺掑悕锛屽鏋渞ank涓虹┖鍒欐樉绀 "-" +}; + +const queryClassStudents = async () => { //鏌ヨ鐝骇鎬讳汉鏁 const res1 = await api.getClassStudents({ params: { classId } }); - - title.value = res.data.title; // 鏇存柊浣滀笟鍚嶇О - score.value = res.data.score; // 鏇存柊涓汉寰楀垎 - rank.value = res.data.rank; // 鏇存柊涓汉鎺掑悕 + console.log(res1); totalStudents.value = res1.data;// 鏇存柊鐝骇鎬讳汉鏁 }; - // 琛岄敭鍑芥暟 const rowKey = (rowData) => { return rowData.id; @@ -73,6 +75,7 @@ const rowKey = (rowData) => { // 鐢熷懡鍛ㄦ湡閽╁瓙 onMounted(() => { queryExamScores(); // 鎸傝浇鏃舵煡璇㈡垚缁 + queryClassStudents();// 鍚屾椂鏌ヨ鐝骇浜烘暟 }); diff --git a/AES/src/main/java/com/example/aes/problem/controller/ProblemController.java b/AES/src/main/java/com/example/aes/problem/controller/ProblemController.java index 344fff7..2258548 100644 --- a/AES/src/main/java/com/example/aes/problem/controller/ProblemController.java +++ b/AES/src/main/java/com/example/aes/problem/controller/ProblemController.java @@ -359,7 +359,22 @@ public class ProblemController { if (ureportsubmitted != null) { return RespBean.ok("鏌ヨ鎴愮哗鎺掑悕鎴愬姛锛", ureportsubmitted); } else { - return RespBean.error("鏌ヨ鎴愮哗鎺掑悕澶辫触锛"); + return RespBean.error("灏氭湭鎻愪氦浣滀笟锛佹殏鏃舵棤娉曟煡鐪嬫帓鍚嶏紒"); + } + } + + //鏍规嵁浣滀笟id鍜屽鐢焛d鑾峰彇瀛︾敓褰撳墠鎶ュ憡鎴愮哗鎺掑悕锛屼笌涓婁竴鏂规硶鍩烘湰绫讳技锛屽鐞嗙┖鎼滅储鏃剁殑杈撳嚭 + @GetMapping("/getSubmitReport") + public RespBean getSubmitReport(Integer examId, HttpServletRequest request) { + DecodeToken decodeToken = new DecodeToken(request); + String UserId = decodeToken.getUserId(); + int userId = Integer.parseInt(UserId); + UReportSubmitted ureportsubmitted = + problemServiceI.findScoreAndRankByIds(examId, userId); + if (ureportsubmitted != null) { + return RespBean.ok("鏌ヨ鎴愮哗鎺掑悕鎴愬姛锛", ureportsubmitted); + } else { + return RespBean.ok("灏氭湭鎻愪氦浣滀笟锛"); } } diff --git a/AES/src/main/java/com/example/aes/user/controller/DownLoadFileController.java b/AES/src/main/java/com/example/aes/user/controller/DownLoadFileController.java index 0295b1a..1fe0aa4 100644 --- a/AES/src/main/java/com/example/aes/user/controller/DownLoadFileController.java +++ b/AES/src/main/java/com/example/aes/user/controller/DownLoadFileController.java @@ -2,10 +2,15 @@ package com.example.aes.user.controller; import cn.hutool.core.io.FileUtil; +import cn.hutool.core.io.resource.UrlResource; import com.example.aes.global.model.RespBean; import org.springframework.core.io.Resource; import org.springframework.core.io.ResourceLoader; +import org.springframework.http.HttpHeaders; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -13,6 +18,8 @@ import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; import java.io.*; import java.net.URLEncoder; +import java.nio.file.Path; +import java.nio.file.Paths; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; @@ -139,4 +146,25 @@ public class DownLoadFileController { } } + // 鎻愪緵鏂囦欢涓嬭浇鐨勬柟娉 + @GetMapping("/downloadFile/{fileName:.+}") + public ResponseEntity downloadFile(@PathVariable String fileName) { + try { + String root = System.getProperty("user.dir") + File.separator + "upload"; + Path filePath = Paths.get(root).toAbsolutePath().normalize().resolve(fileName); + javax.annotation.Resource resource = (javax.annotation.Resource) new UrlResource(filePath.toUri()); + String contentType = "application/octet-stream"; + return ResponseEntity.ok() + .contentType(MediaType.parseMediaType(contentType)) + .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"" + resource.name() + "\"") + .body(resource); + } catch (Exception e) { + e.printStackTrace(); + return ResponseEntity.badRequest() + .body(null); + } + } + + + } diff --git a/AES/src/main/java/com/example/aes/user/controller/importClassStudentsFileController.java b/AES/src/main/java/com/example/aes/user/controller/importClassStudentsFileController.java index 1a26ad4..30ef793 100644 --- a/AES/src/main/java/com/example/aes/user/controller/importClassStudentsFileController.java +++ b/AES/src/main/java/com/example/aes/user/controller/importClassStudentsFileController.java @@ -1,6 +1,7 @@ package com.example.aes.user.controller; import cn.hutool.core.io.FileUtil; +import cn.hutool.core.io.resource.UrlResource; import com.example.aes.global.model.RespBean; import com.example.aes.user.dao.AdminusersDaoI; import com.example.aes.user.dao.ClassesDaoI; @@ -11,19 +12,21 @@ import com.example.aes.user.model.PMUser; import com.example.aes.user.model.Users; import com.example.aes.user.service.UserServiceI; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpHeaders; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.servlet.support.ServletUriComponentsBuilder; import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; import java.io.*; +import java.nio.file.Path; +import java.nio.file.Paths; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.List; +import java.util.*; @RestController @@ -374,4 +377,79 @@ public class importClassStudentsFileController{ return true; } + @PostMapping("/uploadFiles") // 瀛︾敓涓婁紶鏂囦欢骞舵彁渚涘叾URL + public ResponseEntity> uploadFiles(MultipartFile[] files) { + Map response = new HashMap<>(); + try { + // 鑾峰彇鏂囦欢瀛樺偍鏍圭洰褰 + String root = System.getProperty("user.dir") + File.separator + "upload"; + if (!new File(root).exists()) { + new File(root).mkdirs(); + } + + // 鐢ㄤ簬瀛樺偍鎵鏈変笂浼犳枃浠剁殑鍚嶇О鍜孶RL + StringBuilder fileNames = new StringBuilder(); + StringBuilder fileUrls = new StringBuilder(); + + for (MultipartFile file : files) { + // 鑾峰彇鏂囦欢鍘熷鍚 + String uploadFileName = file.getOriginalFilename(); + + // 妫鏌ユ枃浠剁被鍨 + if (!uploadFileName.endsWith(".txt") && !uploadFileName.endsWith(".doc") && + !uploadFileName.endsWith(".docx") && !uploadFileName.endsWith(".pdf")) { + throw new IllegalArgumentException("涓嶆敮鎸佺殑鏂囦欢绫诲瀷: " + uploadFileName); + } + + // 鑾峰彇涓昏鍚嶇О + String mainName = FileUtil.mainName(uploadFileName); + // 鑾峰彇鏂囦欢鍚庣紑鍚 + String extName = FileUtil.extName(uploadFileName); + // 鐢ㄥ綋鍓嶆椂闂撮伩鍏嶉噸澶 + SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMddHHmmss"); + Date date1 = new Date(); + String timeStamp = formatter.format(date1); + + // 鏋勯犳柊鐨勬枃浠跺悕 + String newFileName = mainName + "_" + timeStamp + "." + extName; + + // 鏋勯犳枃浠朵繚瀛樿矾寰 + String filePath = root + File.separator + newFileName; + + // 淇濆瓨鏂囦欢鍒版湇鍔″櫒 + File dest = new File(filePath); + file.transferTo(dest); + + // 鏋勯犳枃浠惰闂甎RL + String fileDownloadUri = ServletUriComponentsBuilder.fromCurrentContextPath() + .path("/downloadFile/") + .path(newFileName) + .toUriString(); + + // 娣诲姞鏂囦欢鍚嶅拰URL鍒拌繑鍥炰俊鎭腑 + fileNames.append(newFileName).append(", "); + fileUrls.append(fileDownloadUri).append(", "); + } + + // 绉婚櫎鏈鍚庝竴涓楀彿鍜岀┖鏍 + if (fileNames.length() > 0) { + fileNames.setLength(fileNames.length() - 2); + } + if (fileUrls.length() > 0) { + fileUrls.setLength(fileUrls.length() - 2); + } + + response.put("code", 0); + response.put("message", "鏂囦欢涓婁紶鎴愬姛"); + response.put("data", fileNames.toString()); + response.put("urls", fileUrls.toString()); + return ResponseEntity.ok(response); + } catch (Exception e) { + e.printStackTrace(); + response.put("code", 1); + response.put("message", "鏂囦欢涓婁紶寮傚父: " + e.getMessage()); + return ResponseEntity.badRequest().body(response); + } + } + } diff --git a/upload/t1_20250413215728.txt b/upload/t1_20250413215728.txt new file mode 100644 index 0000000..b9add5b --- /dev/null +++ b/upload/t1_20250413215728.txt @@ -0,0 +1,4 @@ +鏅鸿兘鎵嬫満鍦ㄥ綋浠ｇぞ浼氱殑浣滅敤涓嶅彲灏忚锛屽畠涓嶄粎浣垮緱浜轰滑鐨勯氳鍙樺緱鏋佷负渚挎嵎锛岃繕鎻愪緵浜嗗鏍峰寲鐨勫ū涔愬拰宸ヤ綔鍔熻兘銆傚湪鎴戝浗锛屾櫤鑳芥墜鏈虹殑鏅強鐜囦笉鏂笂鍗囷紝鍑犱箮鎴愪簡姣忎釜浜虹敓娲讳腑鐨勫繀闇鍝併傚畠鐨勫鍔熻兘鎬у拰渚挎惡鎬э紝浣垮叾鎴愪负浜嗙幇浠ｇ鎶鐨勪竴涓爣蹇楁т骇鐗┿傛棤璁烘槸閫氳銆佸ū涔愯繕鏄涔狅紝閮界涓嶅紑杩欐鐢靛瓙璁惧銆 +鍦ㄥ煄甯傝竟缂樼殑閭ｆ墍钁楀悕澶у鐨勬搷鍦轰笂锛屼竴鍦哄嚑鍗冧汉鍙傚姞鐨勬壒鏂椾細宸茬粡杩涜浜嗚繎涓や釜灏忔椂銆 +鈥滅埍鍥犳柉鍧︽槸鍙嶅姩鐨勫鏈潈濞侊紝浠栨湁濂朵究鏄锛岃窇鍘讳负缇庡笣鍥戒富涔夐犲師瀛愬脊!瑕佸缓绔嬭捣闈╁懡鐨勭瀛︼紝灏辫鎵撳掍互鐩稿璁轰负浠ｈ〃鐨勮祫浜ч樁绾х悊璁洪粦鏃!鈥 +鐒跺悗鍦ㄦ硶鏂囪瘝涓嬪垪鍑哄悓涔夌殑涓婃捣鏂硅█璇嶈锛屽啀灏藉彲鑳借灏藉湴鍒楀嚭杩戜箟鐨勪笂娴锋柟瑷璇嶈銆佺煭璇垨鍙ュ瓙銆傝繖绉嶇紪鍐欐柟寮忥紝瀵逛腑娉曚袱鍥藉涔犺呮垨璇嶅吀浣跨敤鑰呭敖鍙兘澶氬湴鎺屾彙娉曟眽璇嶆眹锛屾樉鐒舵槸寰堟湁鎰忎箟鐨勩 \ No newline at end of file