diff --git a/AES-front/src/api/user.js b/AES-front/src/api/user.js index c32ec68..9c4b3e7 100644 --- a/AES-front/src/api/user.js +++ b/AES-front/src/api/user.js @@ -24,6 +24,6 @@ export default { //作业题目部分 - getExamList: (data) =>request.post('/problem/getExamList')//学生获取作业列表 + getExamList: (config) =>request.get('/problem/getExamList',config)//学生获取作业列表 } diff --git a/AES-front/src/utils/common/common.js b/AES-front/src/utils/common/common.js index 4f6a50a..78e0116 100644 --- a/AES-front/src/utils/common/common.js +++ b/AES-front/src/utils/common/common.js @@ -19,7 +19,18 @@ export function formatDateTimeNoSecond(time = undefined, format = 'YYYY-MM-DD HH export function formatDate(date = undefined, format = 'YYYY-MM-DD') { return formatDateTime(date, format) } - +export function formatTimestamp(timestamp){ + if (timestamp) { + const date = new Date(timestamp); + return date.getFullYear() + '-' + + ('0' + (date.getMonth() + 1)).slice(-2) + '-' + + ('0' + date.getDate()).slice(-2) + ' ' + + ('0' + date.getHours()).slice(-2) + ':' + + ('0' + date.getMinutes()).slice(-2) + ':' + + ('0' + date.getSeconds()).slice(-2); + } + return ''; +} /** * @desc 鍑芥暟鑺傛祦 * @param {Function} fn diff --git a/AES-front/src/views/user/exam-list/index.vue b/AES-front/src/views/user/exam-list/index.vue index 58e57b6..10bbd30 100644 --- a/AES-front/src/views/user/exam-list/index.vue +++ b/AES-front/src/views/user/exam-list/index.vue @@ -18,7 +18,7 @@ import { ref, reactive, onMounted } from 'vue' import api from '@/api/user' import ExamActions from './components/exam-actions.vue' -import { formatDateTime, getToken } from '@/utils' +import {formatTimestamp, getToken} from '@/utils' import { useUserStore } from '@/store' import { useRouter } from 'vue-router' import { useCountdown } from '@/composables' @@ -92,7 +92,7 @@ const onViewScore = (exam) => {//鐐瑰嚮鎴愮哗鎺т欢鐨勯昏緫 const columns = [ { - key: 'name', + key: 'title', title: '浣滀笟鍚嶇О', fixed: 'left', width: 150, @@ -101,23 +101,24 @@ const columns = [ { key: 'description', title: '鎻忚堪淇℃伅', + align: 'center', }, { - key: 'starttime', + key: 'startTime', title: '寮濮嬫椂闂', width: '108', align: 'center', render: (row) => { - return row['starttime'] ? formatDateTime(row['starttime']) : '' + return row['startTime'] ? formatTimestamp(row['startTime']) : '' }, }, { - key: 'endtime', + key: 'endTime', title: '缁撴潫鏃堕棿', width: '108', align: 'center', render: (row) => { - return row['endtime'] ? formatDateTime(row['endtime']) : '' + return row['endTime'] ? formatTimestamp(row['endTime']) : '' }, }, @@ -125,6 +126,7 @@ const columns = [ key: 'status', title: '鐘舵', width: '116', + align: 'center', render: (row, idx) => { if (countdownControllers[row.id]) { const { leftTime, minute, second } = countdownControllers[row.id] @@ -151,8 +153,8 @@ const columns = [ }) }, }, -] +] const queryByPage = async (currentPage) => { @@ -163,8 +165,7 @@ const queryByPage = async (currentPage) => { } try { const res = await api.getExamList({ - pageNum: currentPage, - pageSize: paginationReactive.pageSize, + params: { pageNum: currentPage, pageSize: paginationReactive.pageSize }, }) examList.value = res.data // 鍋囪杩斿洖鐨勬暟鎹湪 res.data 涓 const { pageNum, pageSize, total, list } = res.data @@ -217,7 +218,4 @@ onBeforeUnmount(() => { } }) - - - diff --git a/AES/src/main/java/com/example/aes/global/config/HttpInterceptorConfig.java b/AES/src/main/java/com/example/aes/global/config/HttpInterceptorConfig.java index 47956bc..2145a1a 100644 --- a/AES/src/main/java/com/example/aes/global/config/HttpInterceptorConfig.java +++ b/AES/src/main/java/com/example/aes/global/config/HttpInterceptorConfig.java @@ -22,10 +22,12 @@ public class HttpInterceptorConfig extends WebMvcConfigurationSupport { .excludePathPatterns("/api/login/student","/api/login/admin","/api/login","/api/user/signUser", "/api/user" + "/findStudentByusername","/api/user/findStudentByStudentNo","/api/adminusers/findAdminuserByno","/api/adminusers/findAdminuserByAccountInRePwInfo", + "/api/problem/getExamList", "/api/adminusers" + "/signTeacher", "/api/adminusers" + - "/confirmQuestionAnswer","/api/adminusers/updatePasswordByAccount","/api/adminusers/findAdminuserByAccount"); + "/confirmQuestionAnswer","/api/adminusers/updatePasswordByAccount","/api/adminusers/findAdminuserByAccount" + ); } 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 7e863fc..2da449d 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 @@ -51,13 +51,12 @@ public class ProblemController { public RespBean getExamList(Integer pageNum,Integer pageSize, HttpServletRequest request) { if (pageNum < 1 || pageSize < 1) return RespBean.error("鍙傛暟閿欒锛"); - -// PMProblem pMproblem = new PMProblem(); -// pMproblem.setPageNum(pageNum); -// pMproblem.setPageSize(pageSize); - + PMProblem pMproblem = new PMProblem(); + pMproblem.setPageNum(pageNum); + pMproblem.setPageSize(pageSize); DecodeToken decodeToken = new DecodeToken(request); String userId = decodeToken.getUserId(); + pMproblem.setStudentId(Integer.parseInt(userId)); // 鏍规嵁瀛︾敓id鏌ユ壘鐝骇id List classstudentsList = classesServiceI.findClassIdByStudentId(Integer.parseInt(userId)); @@ -67,10 +66,12 @@ public class ProblemController { classIds.add(classstudent.getClassId()); } - List pMproblems = problemServiceI.getProblemsByClassIds(classIds); + List pMproblems = problemServiceI.getProblemsByClassIds(classIds);//鏍规嵁鐝骇id鏌ヨ鎵鏈変綔涓 + //鍒嗛〉澶勭悊,宸︿负宸叉湁鐨勪綔涓氬垪琛紝鍙充负浠庡墠绔幏鍙栫殑浣滀笟绫伙紝鍖呭惈鍒嗛〉淇℃伅 + DataGrid dataGrid = problemServiceI.dataGrid(pMproblems,pMproblem); - if (pMproblems != null) { - return RespBean.ok("鑾峰彇浣滀笟鍒楄〃鎴愬姛锛",pMproblems); + if (dataGrid != null) { + return RespBean.ok("鑾峰彇浣滀笟鍒楄〃鎴愬姛锛",dataGrid); } else { return RespBean.error("鑾峰彇浣滀笟鍒楄〃澶辫触锛"); } diff --git a/AES/src/main/java/com/example/aes/problem/dao/impl/ProblemDaoImpl.java b/AES/src/main/java/com/example/aes/problem/dao/impl/ProblemDaoImpl.java index 4729d0a..6ae86f8 100644 --- a/AES/src/main/java/com/example/aes/problem/dao/impl/ProblemDaoImpl.java +++ b/AES/src/main/java/com/example/aes/problem/dao/impl/ProblemDaoImpl.java @@ -12,6 +12,7 @@ import org.springframework.jdbc.core.BeanPropertyRowMapper; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Repository; +import java.util.Collections; import java.util.List; @Repository("ProblemDao") @@ -21,25 +22,34 @@ public class ProblemDaoImpl extends BaseDaoImpl implements ProblemDaoI{ private JdbcTemplate jdbcTemplate; @Override - public List findProblemsByClassIds(List classIds){ - // SQL鏌ヨ锛屾牴鎹甤lassIds鑾峰彇problemId, startTime, endTime - String sql = "SELECT p.problem_id AS problemId, pp.start_time AS startTime, pp.end_time AS endTime " + - "FROM postproblem pp " + - "JOIN problem p ON pp.problem_id = p.id " + - "WHERE pp.class_id IN (?)"; + public List findProblemsByClassIds(List classIds) { + // 妫鏌lassIds鏄惁涓虹┖鎴栨病鏈夊厓绱 + if (classIds == null || classIds.isEmpty()) { + return Collections.emptyList(); + } - // 灏哻lassIds杞崲涓洪楀彿鍒嗛殧鐨勫瓧绗︿覆 - String classIdsStr = classIds.toString().replace("[", "").replace("]", ""); + String sql = "SELECT pr.id AS Id, pp.startTime AS startTime, pp.endTime AS endTime, " + + "pr.title AS title, pr.description AS description " + + "FROM postproblem pp " + + "JOIN problem pr ON pp.problemId = pr.id " + + "WHERE pp.classId IN (?)"; - // 鎵ц鏌ヨ - List problems = jdbcTemplate.query( - sql, - new Object[]{classIdsStr}, - new BeanPropertyRowMapper<>(PMProblem.class) - ); + // 灏哻lassIds杞崲涓洪楀彿鍒嗛殧鐨勫瓧绗︿覆锛屽苟鐢ㄩ棶鍙锋浛鎹紝鍥犱负jdbcTemplate浼氬鐞嗗弬鏁扮粦瀹 + String inSql = String.join(",", Collections.nCopies(classIds.size(), "?")); + + // 鏇挎崲SQL涓殑闂彿 + sql = sql.replace("(?)", "(" + inSql + ")"); + + // 鎵ц鏌ヨ + List problems = jdbcTemplate.query( + sql, + classIds.toArray(), // 灏哃ist杞崲涓烘暟缁勶紝鍥犱负jdbcTemplate.query鎺ュ彈鏁扮粍鎴栧彲鍙樺弬鏁 + new BeanPropertyRowMapper<>(PMProblem.class) + ); + + return problems; + } - return problems; - } public void addScoringRubric(PMScoringRubric pmScoringRubric){ }; diff --git a/AES/src/main/java/com/example/aes/problem/model/DataGrid.java b/AES/src/main/java/com/example/aes/problem/model/DataGrid.java new file mode 100644 index 0000000..986dd46 --- /dev/null +++ b/AES/src/main/java/com/example/aes/problem/model/DataGrid.java @@ -0,0 +1,40 @@ +package com.example.aes.problem.model; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +@Data +public class DataGrid implements java.io.Serializable {//鐢ㄤ簬瀹炵幇鍒嗛〉绫 + + private static final long serialVersionUID = 1538274527426L; + + // 鎬荤殑璁板綍琛屾暟 +// private long totalLines; + private long total; // 鍘焧otalLines + + // 鎬荤殑椤垫暟 + @JsonIgnore + private long totalPages; + + // 姣忛〉鏄剧ず澶氬皯琛 +// private long pageLines; + + // 姣忛〉鏄剧ず鐨勮鏁 + private long pageSize; + // 褰撳墠鎵鍦ㄩ〉 + private long pageNum; + + // 褰撳墠椤电殑鏁版嵁琛屾暟閲,鍙湁鍦ㄦ渶鍚庝竴椤垫椂浼氬拰姣忛〉鏄剧ず澶氬皯琛屽彲鑳戒笉鍚 + @JsonIgnore + private long currentPageLineNum; + + // 褰撳墠椤电殑鎵鏈夋暟鎹 + @SuppressWarnings("rawtypes") +// private List rows = new ArrayList(); + private List list = new ArrayList(); // 鍘焤ows + + +} diff --git a/AES/src/main/java/com/example/aes/problem/model/PMProblem.java b/AES/src/main/java/com/example/aes/problem/model/PMProblem.java index 71f2226..1318525 100644 --- a/AES/src/main/java/com/example/aes/problem/model/PMProblem.java +++ b/AES/src/main/java/com/example/aes/problem/model/PMProblem.java @@ -32,7 +32,7 @@ public class PMProblem extends Problem implements java.io.Serializable{//缁ф壙P private String status;//鏈鍚庡湪椤甸潰鏄剧ず鐨勭姸鎬侊紝鍙栧喅浜庝笂闈笁涓弬鏁般 //(浣滀笟鍒楄〃)椤甸潰闇瑕佺殑鍚庡彴鏁版嵁 - private int studentId;//瀛︾敓id + private Integer studentId;//瀛︾敓id private int classId;//鐝骇id diff --git a/AES/src/main/java/com/example/aes/problem/service/Impl/ProblemServiceImpl.java b/AES/src/main/java/com/example/aes/problem/service/Impl/ProblemServiceImpl.java index 58eb9c8..a172a52 100644 --- a/AES/src/main/java/com/example/aes/problem/service/Impl/ProblemServiceImpl.java +++ b/AES/src/main/java/com/example/aes/problem/service/Impl/ProblemServiceImpl.java @@ -7,6 +7,7 @@ import com.example.aes.problem.model.PMScoringRubric; import com.example.aes.problem.model.ScoringRubric; import com.example.aes.problem.model.UScoringRubric; import com.example.aes.problem.service.ProblemServiceI; +import com.example.aes.user.model.Classstudents; import com.example.aes.user.model.Course; import com.example.aes.user.model.DataGrid; import com.example.aes.user.model.PMCourse; @@ -15,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; +import java.util.Collections; import java.util.List; @Service public class ProblemServiceImpl implements ProblemServiceI { @@ -53,7 +55,56 @@ public class ProblemServiceImpl implements ProblemServiceI { return uScoringRubricList; } - }; + } + + @Override + public DataGrid dataGrid(List pMproblems, PMProblem pMproblem) { + DataGrid dg = new DataGrid(); + long totalLines;// 鎬昏褰曡鏁 + List pagedPMProblems; + + // 璁剧疆鎬昏褰曡鏁 + totalLines = (long) pMproblems.size(); + + // 璁＄畻鍒嗛〉淇℃伅 + int pageSize = pMproblem.getPageSize(); + int pageNum = pMproblem.getPageNum(); + int fromIndex = (pageNum - 1) * pageSize; + int toIndex = fromIndex + pageSize; + + // 瀵归棶棰樺垪琛ㄨ繘琛屽垎椤靛鐞 + if (fromIndex < pMproblems.size()) { + if (toIndex > pMproblems.size()) { + toIndex = pMproblems.size(); + } + pagedPMProblems = pMproblems.subList(fromIndex, toIndex); + } else { + pagedPMProblems = Collections.emptyList(); + } + + // 濡傛灉鍒嗛〉鍚庣殑鍒楄〃涓虹┖ + if (pagedPMProblems.isEmpty()) { + return null; + } else { + // 杩欓噷鍙互娣诲姞棰濆鐨勫鐞嗛昏緫锛屾瘮濡傝缃瘡涓 PMProblem 鐨勯澶栧睘鎬 + + // 璁剧疆鎬荤殑璁板綍琛屾暟 + dg.setTotal(totalLines); + // 璁剧疆姣忛〉鏄剧ず澶氬皯琛 + dg.setPageSize(pageSize); + // 璁剧疆鎬荤殑椤垫暟锛屾婚〉鏁 = (鎬昏鏁 / 姣忛〉鏄剧ず澶氬皯琛) 鍚戜笂鍙栨暣 + dg.setTotalPages((long) Math.ceil((double) totalLines / (double) pageSize)); + // 璁剧疆褰撳墠鏄剧ず绗嚑椤 + dg.setPageNum(pageNum); + // 璁剧疆褰撳墠椤电殑鏁版嵁琛屾暟閲 + dg.setCurrentPageLineNum(pagedPMProblems.size()); + // 璁剧疆褰撳墠椤电殑鎵鏈夋暟鎹 + dg.setList(pagedPMProblems); + return dg; + } + } + + ; private void changeModel1(List l, List nl) { if (l != null && l.size() > 0) { diff --git a/AES/src/main/java/com/example/aes/problem/service/ProblemServiceI.java b/AES/src/main/java/com/example/aes/problem/service/ProblemServiceI.java index 62c879f..26c555b 100644 --- a/AES/src/main/java/com/example/aes/problem/service/ProblemServiceI.java +++ b/AES/src/main/java/com/example/aes/problem/service/ProblemServiceI.java @@ -14,4 +14,5 @@ public interface ProblemServiceI { public void addScoringRubric(PMScoringRubric pmscoringRubric); public List findScoringRubricNoStandardId(); + DataGrid dataGrid(List pMproblems, PMProblem pMproblem); }