From c2cd507da74f1841d0133d4c9bff9025ce1066ba Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 09 七月 2024 10:00:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev'
---
src/main/java/com/mindskip/xzs/controller/admin/ExamTemplatesController.java | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/controller/admin/ExamTemplatesController.java b/src/main/java/com/mindskip/xzs/controller/admin/ExamTemplatesController.java
index 026dfc8..df1f7a2 100644
--- a/src/main/java/com/mindskip/xzs/controller/admin/ExamTemplatesController.java
+++ b/src/main/java/com/mindskip/xzs/controller/admin/ExamTemplatesController.java
@@ -5,12 +5,15 @@
import com.mindskip.xzs.base.RestResponse;
import com.mindskip.xzs.context.WebContext;
import com.mindskip.xzs.domain.ExamTemplates;
+import com.mindskip.xzs.domain.ExamTemplatesConfig;
import com.mindskip.xzs.domain.ExamTemplatesSubject;
import com.mindskip.xzs.domain.vo.ExamTemplatesVO;
import com.mindskip.xzs.repository.ExamTemplatesSubjectMapper;
import com.mindskip.xzs.service.ExamPaperDepartmentService;
+import com.mindskip.xzs.service.ExamTemplatesConfigService;
import com.mindskip.xzs.service.ExamTemplatesService;
import com.mindskip.xzs.utility.PageInfoHelper;
+import com.mindskip.xzs.utility.minio.DateUtils;
import com.mindskip.xzs.viewmodel.admin.exam.ExamPaperEditRequestVM;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.ObjectUtils;
@@ -18,6 +21,7 @@
import javax.validation.Valid;
import java.util.List;
+import java.util.Objects;
import java.util.stream.Collectors;
@RestController("AdminExamTemplatesController")
@@ -26,6 +30,7 @@
public class ExamTemplatesController extends BaseApiController {
private final ExamTemplatesService examTemplatesService;
+ private final ExamTemplatesConfigService examTemplatesConfigService;
private final ExamTemplatesSubjectMapper examTemplatesSubjectMapper;
private final WebContext webContext;
private final ExamPaperDepartmentService examPaperDepartmentService;
@@ -70,10 +75,18 @@
return RestResponse.ok();
}
-// @RequestMapping(value = "/random", method = RequestMethod.POST)
-// public RestResponse<Integer> randomExam() throws Exception {
-// User user = getCurrentUser();
-// Integer id = examTemplatesService.randomExam(user);
-// return RestResponse.ok(id);
-// }
+ @PostMapping("/setConfig")
+ public RestResponse<Boolean> setConfig(@RequestBody ExamTemplatesConfig examTemplatesConfig) {
+ if (Objects.isNull(examTemplatesConfig.getId())) {
+ examTemplatesConfig.setCreateUser(getCurrentUser().getId());
+ examTemplatesConfig.setCreateTime(DateUtils.getNowDate());
+ }
+ return RestResponse.ok(examTemplatesConfigService.saveOrUpdate(examTemplatesConfig));
+ }
+
+ @GetMapping("/getConfig")
+ public RestResponse<ExamTemplatesConfig> getConfig() {
+ return RestResponse.ok(examTemplatesConfigService.getConfig());
+ }
+
}
--
Gitblit v1.8.0