From 8dac3a3c993ef006d4765624e046577217d1a898 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 28 十一月 2023 21:27:09 +0800
Subject: [PATCH] 随机案件时间段
---
src/main/java/com/mindskip/xzs/controller/admin/ExamTemplatesController.java | 3 +
src/main/java/com/mindskip/xzs/service/impl/ExamTemplatesServiceImpl.java | 12 ++++++
src/main/java/com/mindskip/xzs/domain/ExamTemplates.java | 43 +++++++++++++++------
src/main/java/com/mindskip/xzs/viewmodel/admin/exam/ExamPaperEditRequestVM.java | 25 ++++++++++++
4 files changed, 70 insertions(+), 13 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 43dc63d..021b513 100644
--- a/src/main/java/com/mindskip/xzs/controller/admin/ExamTemplatesController.java
+++ b/src/main/java/com/mindskip/xzs/controller/admin/ExamTemplatesController.java
@@ -12,6 +12,7 @@
import com.mindskip.xzs.service.ExamTemplatesService;
import com.mindskip.xzs.utility.PageInfoHelper;
import com.mindskip.xzs.viewmodel.admin.exam.ExamPaperEditRequestVM;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
@@ -19,6 +20,7 @@
@RestController("AdminExamTemplatesController")
@RequestMapping(value = "/api/admin/exam/templates")
+@Slf4j
public class ExamTemplatesController extends BaseApiController {
private final ExamTemplatesService examTemplatesService;
@@ -31,6 +33,7 @@
@RequestMapping(value = "/edit", method = RequestMethod.POST)
public RestResponse edit(@RequestBody @Valid ExamPaperEditRequestVM model) {
+ log.info("--------->鍙傛暟{}",model);
examTemplatesService.add(model);
return RestResponse.ok();
}
diff --git a/src/main/java/com/mindskip/xzs/domain/ExamTemplates.java b/src/main/java/com/mindskip/xzs/domain/ExamTemplates.java
index 972ca28..0424a39 100644
--- a/src/main/java/com/mindskip/xzs/domain/ExamTemplates.java
+++ b/src/main/java/com/mindskip/xzs/domain/ExamTemplates.java
@@ -1,7 +1,9 @@
package com.mindskip.xzs.domain;
import java.io.Serializable;
+import java.time.LocalDateTime;
import java.util.Date;
+import java.util.List;
public class ExamTemplates implements Serializable {
@@ -13,6 +15,33 @@
private Date ctime;
private String status;
private String menuIds;
+ private List<String> limitDateTime;
+ private LocalDateTime startTime;
+ private LocalDateTime endTime;
+
+ public LocalDateTime getStartTime() {
+ return startTime;
+ }
+
+ public void setStartTime(LocalDateTime startTime) {
+ this.startTime = startTime;
+ }
+
+ public LocalDateTime getEndTime() {
+ return endTime;
+ }
+
+ public void setEndTime(LocalDateTime endTime) {
+ this.endTime = endTime;
+ }
+
+ public List<String> getLimitDateTime() {
+ return limitDateTime;
+ }
+
+ public void setLimitDateTime(List<String> limitDateTime) {
+ this.limitDateTime = limitDateTime;
+ }
public Integer getId() {
return id;
@@ -78,17 +107,5 @@
this.menuIds = menuIds;
}
- @Override
- public String toString() {
- return "ExamTemplates{" +
- "id=" + id +
- ", name='" + name + '\'' +
- ", paperType='" + paperType + '\'' +
- ", suggestTime='" + suggestTime + '\'' +
- ", titleName='" + titleName + '\'' +
- ", ctime='" + ctime + '\'' +
- ", status='" + status + '\'' +
- ", menuIds='" + menuIds + '\'' +
- '}';
- }
+
}
diff --git a/src/main/java/com/mindskip/xzs/service/impl/ExamTemplatesServiceImpl.java b/src/main/java/com/mindskip/xzs/service/impl/ExamTemplatesServiceImpl.java
index d06ee00..4aa2e16 100644
--- a/src/main/java/com/mindskip/xzs/service/impl/ExamTemplatesServiceImpl.java
+++ b/src/main/java/com/mindskip/xzs/service/impl/ExamTemplatesServiceImpl.java
@@ -13,9 +13,13 @@
import com.mindskip.xzs.viewmodel.admin.exam.ExamPaperEditRequestVM;
import com.mindskip.xzs.viewmodel.admin.exam.ExamPaperTitleItemVM;
import com.mindskip.xzs.viewmodel.admin.exam.QuestionTypeVM;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
@@ -23,6 +27,7 @@
import java.util.stream.Collectors;
@Service
+@Slf4j
public class ExamTemplatesServiceImpl extends BaseServiceImpl<ExamTemplates> implements ExamTemplatesService {
private final ExamTemplatesMapper examTemplatesMapper;
@@ -52,10 +57,17 @@
}
ExamTemplates examTemplates = ExamTemplatesClassConvert.INSTANCE.ExamPaperEditRequestVMToExamTemplates(model);
+
+ DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+ LocalDateTime startTime = LocalDateTime.parse(model.getLimitDateTime().get(0),dateTimeFormatter);
+ LocalDateTime endTime = LocalDateTime.parse(model.getLimitDateTime().get(1),dateTimeFormatter);
+
examTemplates.setCtime(new Date());
examTemplates.setTitleName(model.getTitleItems().get(0).getName());
examTemplates.setStatus(model.getStatus());
examTemplates.setMenuIds(model.getMenuIds());
+ examTemplates.setStartTime(startTime);
+ examTemplates.setEndTime(endTime);
examTemplatesMapper.add(examTemplates);
List<ExamTemplatesQuestion> examTemplatesQuestions = ExamTemplatesClassConvert.INSTANCE.QuestionTypeVMListToExamTemplatesQuestionList(model.getQuestionTypeVMS())
diff --git a/src/main/java/com/mindskip/xzs/viewmodel/admin/exam/ExamPaperEditRequestVM.java b/src/main/java/com/mindskip/xzs/viewmodel/admin/exam/ExamPaperEditRequestVM.java
index 25295e5..570771a 100644
--- a/src/main/java/com/mindskip/xzs/viewmodel/admin/exam/ExamPaperEditRequestVM.java
+++ b/src/main/java/com/mindskip/xzs/viewmodel/admin/exam/ExamPaperEditRequestVM.java
@@ -5,6 +5,7 @@
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
+import java.util.Arrays;
import java.util.List;
import java.util.Map;
@@ -192,4 +193,28 @@
public void setMenuIds(String menuIds) {
this.menuIds = menuIds;
}
+
+ @Override
+ public String toString() {
+ return "ExamPaperEditRequestVM{" +
+ "id=" + id +
+ ", level=" + level +
+ ", subjectId=" + Arrays.toString(subjectId) +
+ ", paperType=" + paperType +
+ ", name='" + name + '\'' +
+ ", suggestTime=" + suggestTime +
+ ", limitDateTime=" + limitDateTime +
+ ", titleItems=" + titleItems +
+ ", score='" + score + '\'' +
+ ", departmentIds=" + Arrays.toString(departmentIds) +
+ ", userIds=" + Arrays.toString(userIds) +
+ ", subjectSource=" + subjectSource +
+ ", questionTypeVMS=" + questionTypeVMS +
+ ", aggregateSource=" + aggregateSource +
+ ", userId=" + Arrays.toString(userId) +
+ ", type='" + type + '\'' +
+ ", status='" + status + '\'' +
+ ", menuIds='" + menuIds + '\'' +
+ '}';
+ }
}
--
Gitblit v1.8.0