From 8bcc04c9623e0eee0995e1139dee6258a8df464d Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 12 六月 2024 09:14:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ycl/jxkg/controller/admin/ExamPaperController.java | 6
src/main/java/com/ycl/jxkg/domain/query/ClassesQuery.java | 2
src/main/java/com/ycl/jxkg/service/ClassesService.java | 8
src/main/java/com/ycl/jxkg/controller/admin/ExamPaperAnswerController.java | 13
src/main/java/com/ycl/jxkg/service/impl/ExamPaperAnswerServiceImpl.java | 5
src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java | 124 ++++++++
src/main/java/com/ycl/jxkg/domain/entity/Exam.java | 62 ++++
pom.xml | 7
src/main/java/com/ycl/jxkg/domain/form/ExamForm.java | 65 ++++
src/main/java/com/ycl/jxkg/enums/general/ExamStatusEnum.java | 55 +++
src/main/java/com/ycl/jxkg/domain/query/ExamQuery.java | 29 +
src/main/resources/mapper/ExamMapper.xml | 77 +++++
src/main/java/com/ycl/jxkg/service/impl/ExamPaperServiceImpl.java | 25 +
src/main/java/com/ycl/jxkg/domain/vo/student/exampaper/ExamPaperAnswerExportVO.java | 40 ++
src/main/java/com/ycl/jxkg/domain/vo/ExamVO.java | 66 ++++
src/main/java/com/ycl/jxkg/service/impl/ClassesServiceImpl.java | 17 +
src/main/java/com/ycl/jxkg/service/ExamPaperService.java | 9
src/main/java/com/ycl/jxkg/controller/admin/ExamController.java | 83 +++++
src/main/java/com/ycl/jxkg/mapper/ExamMapper.java | 34 ++
src/main/java/com/ycl/jxkg/service/ExamService.java | 65 ++++
src/main/resources/mapper/ClassesMapper.xml | 2
src/main/java/com/ycl/jxkg/controller/admin/ClassesController.java | 7
src/main/java/com/ycl/jxkg/domain/entity/Classes.java | 3
src/main/java/com/ycl/jxkg/service/ExamPaperAnswerService.java | 7
src/main/java/com/ycl/jxkg/utils/ExcelUtils.java | 61 ++++
25 files changed, 869 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index fbd1c5a..f4960a2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,6 +20,7 @@
<mybatisplus.version>3.5.4</mybatisplus.version>
<lombok.version>1.18.24</lombok.version>
<knife.version>3.0.3</knife.version>
+ <easyexcel.version>3.3.2</easyexcel.version>
</properties>
@@ -159,6 +160,12 @@
<optional>true</optional>
</dependency>
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>easyexcel</artifactId>
+ <version>${easyexcel.version}</version>
+ </dependency>
+
</dependencies>
diff --git a/src/main/java/com/ycl/jxkg/controller/admin/ClassesController.java b/src/main/java/com/ycl/jxkg/controller/admin/ClassesController.java
index 3167d00..875b882 100644
--- a/src/main/java/com/ycl/jxkg/controller/admin/ClassesController.java
+++ b/src/main/java/com/ycl/jxkg/controller/admin/ClassesController.java
@@ -85,4 +85,11 @@
public Result list() {
return classesService.all();
}
+
+ @GetMapping("/my")
+ @PreAuthorize("hasAuthority('classes:my')")
+ @ApiOperation(value = "鎴戠殑鐝骇", notes = "鎴戠殑鐝骇")
+ public Result myClassList() {
+ return classesService.myClassList();
+ }
}
diff --git a/src/main/java/com/ycl/jxkg/controller/admin/ExamController.java b/src/main/java/com/ycl/jxkg/controller/admin/ExamController.java
new file mode 100644
index 0000000..3532a3d
--- /dev/null
+++ b/src/main/java/com/ycl/jxkg/controller/admin/ExamController.java
@@ -0,0 +1,83 @@
+package com.ycl.jxkg.controller.admin;
+
+import com.ycl.jxkg.group.Update;
+import com.ycl.jxkg.group.Add;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.security.access.prepost.PreAuthorize;
+import lombok.RequiredArgsConstructor;
+import java.util.List;
+import org.springframework.validation.annotation.Validated;
+import javax.validation.constraints.NotEmpty;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.ycl.jxkg.service.ExamService;
+import com.ycl.jxkg.base.Result;
+import com.ycl.jxkg.domain.form.ExamForm;
+import com.ycl.jxkg.domain.query.ExamQuery;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 鑰冭瘯 鍓嶇鎺у埗鍣�
+ *
+ * @author xp
+ * @since 2024-06-11
+ */
+@Validated
+@RequiredArgsConstructor
+@Api(value = "鑰冭瘯", tags = "鑰冭瘯绠＄悊")
+@RestController
+@RequestMapping("/api/exam")
+public class ExamController {
+
+ private final ExamService examService;
+
+ @PostMapping
+ @ApiOperation(value = "娣诲姞", notes = "娣诲姞")
+ @PreAuthorize("hasAuthority('exam:add')")
+ public Result add(@RequestBody @Validated(Add.class) ExamForm form) {
+ return examService.add(form);
+ }
+
+ @PutMapping
+ @ApiOperation(value = "淇敼", notes = "淇敼")
+ @PreAuthorize("hasAuthority('exam:edit')")
+ public Result update(@RequestBody @Validated(Update.class) ExamForm form) {
+ return examService.update(form);
+ }
+
+ @DeleteMapping("/{id}")
+ @ApiOperation(value = "ID鍒犻櫎", notes = "ID鍒犻櫎")
+ @PreAuthorize("hasAuthority('exam:del')")
+ public Result removeById(@PathVariable("id") String id) {
+ return examService.removeById(id);
+ }
+
+ @DeleteMapping("/batch")
+ @ApiOperation(value = "鎵归噺鍒犻櫎", notes = "鎵归噺鍒犻櫎")
+ @PreAuthorize("hasAuthority('exam:del:batch')")
+ public Result remove(@RequestBody @NotEmpty(message = "璇烽�夋嫨鏁版嵁") List<String> ids) {
+ return examService.remove(ids);
+ }
+
+ @GetMapping("/page")
+ @ApiOperation(value = "鍒嗛〉", notes = "鍒嗛〉")
+ @PreAuthorize("hasAuthority('exam:page')")
+ public Result page(ExamQuery query) {
+ return examService.page(query);
+ }
+
+ @GetMapping("/{id}")
+ @ApiOperation(value = "璇︽儏", notes = "璇︽儏")
+ @PreAuthorize("hasAuthority('exam:detail')")
+ public Result detail(@PathVariable("id") Integer id) {
+ return examService.detail(id);
+ }
+
+ @GetMapping("/list")
+ @PreAuthorize("hasAuthority('exam:list')")
+ @ApiOperation(value = "鍒楄〃", notes = "鍒楄〃")
+ public Result list() {
+ return examService.all();
+ }
+}
diff --git a/src/main/java/com/ycl/jxkg/controller/admin/ExamPaperAnswerController.java b/src/main/java/com/ycl/jxkg/controller/admin/ExamPaperAnswerController.java
index c2b7566..28d7d0d 100644
--- a/src/main/java/com/ycl/jxkg/controller/admin/ExamPaperAnswerController.java
+++ b/src/main/java/com/ycl/jxkg/controller/admin/ExamPaperAnswerController.java
@@ -8,11 +8,17 @@
import com.ycl.jxkg.domain.vo.admin.paper.ExamPaperAnswerPageRequestVO;
import com.ycl.jxkg.domain.vo.student.exam.ExamPaperReadVO;
import com.ycl.jxkg.domain.vo.student.exam.ExamPaperSubmitVO;
+import com.ycl.jxkg.domain.vo.student.exampaper.ExamPaperAnswerExportVO;
import com.ycl.jxkg.domain.vo.student.exampaper.ExamPaperAnswerPageResponseVO;
import com.ycl.jxkg.service.ExamPaperAnswerService;
import com.ycl.jxkg.service.ExamPaperService;
+import com.ycl.jxkg.utils.ExcelUtils;
import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
@RequiredArgsConstructor
@RestController("AdminExamPaperAnswerController")
@@ -32,6 +38,13 @@
return Result.ok(examPaperAnswerService.adminPage(model));
}
+ @RequestMapping(value = "/exportExcel", method = RequestMethod.POST)
+ @SneakyThrows
+ public void exportExcel(ExamPaperAnswerPageRequestVO model, HttpServletResponse response) {
+ List<ExamPaperAnswerPageResponseVO> list = examPaperAnswerService.list(model);
+ ExcelUtils.exportExcelToTarget(response, "", "鎴愮哗鍒楄〃", list, ExamPaperAnswerExportVO.class);
+ }
+
@PostMapping("/read/{id}")
public Result<ExamPaperReadVO> read(@PathVariable Integer id) {
ExamPaperAnswer examPaperAnswer = examPaperAnswerService.getById(id);
diff --git a/src/main/java/com/ycl/jxkg/controller/admin/ExamPaperController.java b/src/main/java/com/ycl/jxkg/controller/admin/ExamPaperController.java
index 2dffa72..ad3a1f7 100644
--- a/src/main/java/com/ycl/jxkg/controller/admin/ExamPaperController.java
+++ b/src/main/java/com/ycl/jxkg/controller/admin/ExamPaperController.java
@@ -92,4 +92,10 @@
baseMapper.deleteById(id);
return Result.ok();
}
+
+ @GetMapping("/my")
+ public Result myExamPaper(Integer paperType) {
+ List<ExamPaper> list = examPaperService.myExamPaper(paperType);
+ return Result.ok(list);
+ }
}
diff --git a/src/main/java/com/ycl/jxkg/domain/entity/Classes.java b/src/main/java/com/ycl/jxkg/domain/entity/Classes.java
index a8af373..8956d34 100644
--- a/src/main/java/com/ycl/jxkg/domain/entity/Classes.java
+++ b/src/main/java/com/ycl/jxkg/domain/entity/Classes.java
@@ -1,5 +1,6 @@
package com.ycl.jxkg.domain.entity;
+import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -53,6 +54,6 @@
/** 澶囨敞 */
private String remark;
- @TableField("create_time")
+ @TableField(value = "create_time", fill = FieldFill.INSERT)
private Date createTime;
}
diff --git a/src/main/java/com/ycl/jxkg/domain/entity/Exam.java b/src/main/java/com/ycl/jxkg/domain/entity/Exam.java
new file mode 100644
index 0000000..54e6def
--- /dev/null
+++ b/src/main/java/com/ycl/jxkg/domain/entity/Exam.java
@@ -0,0 +1,62 @@
+package com.ycl.jxkg.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.util.Date;
+
+import com.ycl.jxkg.domain.base.AbsEntity;
+import com.ycl.jxkg.enums.general.ExamStatusEnum;
+import lombok.Data;
+
+/**
+ * 鑰冭瘯
+ *
+ * @author xp
+ * @since 2024-06-11
+ */
+@Data
+@TableName("t_exam")
+public class Exam extends AbsEntity {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableField("exam_name")
+ /** 鑰冭瘯鍚嶇О */
+ private String examName;
+
+ @TableField("exam_paper_id")
+ /** 璇曞嵎ID */
+ private Integer examPaperId;
+
+ @TableField("classes_id")
+ /** 鐝骇ID */
+ private Integer classesId;
+
+ @TableField("exam_paper_type")
+ /** 璇曞嵎绫诲瀷 */
+ private Integer examPaperType;
+
+ @TableField("exam_place")
+ /** 鑰冭瘯鍦扮偣 */
+ private String examPlace;
+
+ @TableField("status")
+ /** 鑰冭瘯鐘舵�� */
+ private ExamStatusEnum status;
+
+ @TableField("start_time")
+ /** 寮�濮嬫椂闂� */
+ private Date startTime;
+
+ @TableField("end_time")
+ /** 缁撴潫鏃堕棿 */
+ private Date endTime;
+
+ @TableField("teacher_id")
+ /** 鍒涘缓鑰佸笀 */
+ private Integer teacherId;
+
+ @TableField(value = "create_time", fill = FieldFill.INSERT)
+ private Date createTime;
+}
diff --git a/src/main/java/com/ycl/jxkg/domain/form/ExamForm.java b/src/main/java/com/ycl/jxkg/domain/form/ExamForm.java
new file mode 100644
index 0000000..7f2b50b
--- /dev/null
+++ b/src/main/java/com/ycl/jxkg/domain/form/ExamForm.java
@@ -0,0 +1,65 @@
+package com.ycl.jxkg.domain.form;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ycl.jxkg.group.Update;
+import com.ycl.jxkg.group.Add;
+import com.ycl.jxkg.domain.base.AbsForm;
+import com.ycl.jxkg.domain.entity.Exam;
+import org.springframework.beans.BeanUtils;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import org.springframework.lang.NonNull;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+/**
+ * 鑰冭瘯琛ㄥ崟
+ *
+ * @author xp
+ * @since 2024-06-11
+ */
+@Data
+@ApiModel(value = "Exam琛ㄥ崟", description = "鑰冭瘯琛ㄥ崟")
+public class ExamForm extends AbsForm {
+
+ @NotBlank(message = "鑰冭瘯鍚嶇О涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+ @ApiModelProperty("鑰冭瘯鍚嶇О")
+ private String examName;
+
+ @NotNull(message = "鑰冭瘯璇曞嵎涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+ @ApiModelProperty("璇曞嵎ID")
+ private Integer examPaperId;
+
+ @NotNull(message = "鍙傝�冪彮绾т笉鑳戒负绌�", groups = {Add.class, Update.class})
+ @ApiModelProperty("鐝骇ID")
+ private Integer classesId;
+
+ @NotNull(message = "璇曞嵎绫诲瀷涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+ @ApiModelProperty("璇曞嵎绫诲瀷")
+ private Integer examPaperType;
+
+ @NotBlank(message = "鑰冭瘯鍦扮偣涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+ @ApiModelProperty("鑰冭瘯鍦扮偣")
+ private String examPlace;
+
+ @NotNull(message = "寮�濮嬫椂闂翠笉鑳戒负绌�", groups = {Add.class, Update.class})
+ @ApiModelProperty("寮�濮嬫椂闂�")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date startTime;
+
+ @NotNull(message = "缁撴潫鏃堕棿涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+ @ApiModelProperty("缁撴潫鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date endTime;
+
+ public static Exam getEntityByForm(@NonNull ExamForm form, Exam entity) {
+ if(entity == null) {
+ entity = new Exam();
+ }
+ BeanUtils.copyProperties(form, entity);
+ return entity;
+ }
+
+}
diff --git a/src/main/java/com/ycl/jxkg/domain/query/ClassesQuery.java b/src/main/java/com/ycl/jxkg/domain/query/ClassesQuery.java
index c28defa..dbb756b 100644
--- a/src/main/java/com/ycl/jxkg/domain/query/ClassesQuery.java
+++ b/src/main/java/com/ycl/jxkg/domain/query/ClassesQuery.java
@@ -26,5 +26,7 @@
/** 鐝骇鐘舵�� */
private String status;
+ private Integer userId;
+
}
diff --git a/src/main/java/com/ycl/jxkg/domain/query/ExamQuery.java b/src/main/java/com/ycl/jxkg/domain/query/ExamQuery.java
new file mode 100644
index 0000000..1213f10
--- /dev/null
+++ b/src/main/java/com/ycl/jxkg/domain/query/ExamQuery.java
@@ -0,0 +1,29 @@
+package com.ycl.jxkg.domain.query;
+
+import com.ycl.jxkg.domain.base.AbsQuery;
+import java.util.List;
+import org.springframework.lang.NonNull;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 鑰冭瘯鏌ヨ
+ *
+ * @author xp
+ * @since 2024-06-11
+ */
+@Data
+@ApiModel(value = "Exam鏌ヨ", description = "鑰冭瘯鏌ヨ")
+public class ExamQuery extends AbsQuery {
+
+ /** 鑰冭瘯鍚嶇О */
+ private String examName;
+
+ /** 鐝骇 */
+ private Integer classesId;
+
+}
+
diff --git a/src/main/java/com/ycl/jxkg/domain/vo/ExamVO.java b/src/main/java/com/ycl/jxkg/domain/vo/ExamVO.java
new file mode 100644
index 0000000..86f7669
--- /dev/null
+++ b/src/main/java/com/ycl/jxkg/domain/vo/ExamVO.java
@@ -0,0 +1,66 @@
+package com.ycl.jxkg.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ycl.jxkg.domain.base.AbsVo;
+import com.ycl.jxkg.domain.entity.Exam;
+import java.util.List;
+import org.springframework.lang.NonNull;
+import org.springframework.beans.BeanUtils;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+/**
+ * 鑰冭瘯灞曠ず
+ *
+ * @author xp
+ * @since 2024-06-11
+ */
+@Data
+public class ExamVO extends AbsVo {
+
+ /** 鑰冭瘯鍚嶇О */
+ private String examName;
+
+ /** 璇曞嵎ID */
+ private Integer examPaperId;
+ private String examPaperName;
+
+ /** 鐝骇ID */
+ private Integer classesId;
+ private String className;
+
+ /** 璇曞嵎绫诲瀷 */
+ private Integer examPaperType;
+
+ /** 鑰冭瘯鍦扮偣 */
+ private String examPlace;
+
+ /** 鑰冭瘯鐘舵�� */
+ private String status;
+
+ /** 寮�濮嬫椂闂� */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date startTime;
+
+ /** 缁撴潫鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date endTime;
+
+ /** 鍒涘缓鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ /** 鍒涘缓鑰佸笀 */
+ private Integer teacherId;
+
+ public static ExamVO getVoByEntity(@NonNull Exam entity, ExamVO vo) {
+ if(vo == null) {
+ vo = new ExamVO();
+ }
+ BeanUtils.copyProperties(entity, vo);
+ return vo;
+ }
+
+}
diff --git a/src/main/java/com/ycl/jxkg/domain/vo/student/exampaper/ExamPaperAnswerExportVO.java b/src/main/java/com/ycl/jxkg/domain/vo/student/exampaper/ExamPaperAnswerExportVO.java
new file mode 100644
index 0000000..d60564e
--- /dev/null
+++ b/src/main/java/com/ycl/jxkg/domain/vo/student/exampaper/ExamPaperAnswerExportVO.java
@@ -0,0 +1,40 @@
+package com.ycl.jxkg.domain.vo.student.exampaper;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.enums.poi.HorizontalAlignmentEnum;
+import lombok.Data;
+
+/**
+ * @author gonghl
+ * @since 2024/6/7 涓嬪崍 4:58
+ */
+
+@Data
+@ColumnWidth(18)
+@ContentStyle(horizontalAlignment= HorizontalAlignmentEnum.CENTER)
+public class ExamPaperAnswerExportVO {
+
+ @ExcelProperty("濮撳悕")
+ private String userName;
+
+ @ExcelProperty("鍒嗘暟")
+ private String userScore;
+
+ @ExcelProperty("鎬诲垎")
+ private String paperScore;
+
+ @ExcelProperty("姝ｇ‘棰樻暟")
+ private Integer questionCorrect;
+
+ @ExcelProperty("棰樼洰鎬绘暟")
+ private Integer questionCount;
+
+ @ExcelProperty("绛旈鏃堕棿")
+ private String doTime;
+
+ @ExcelProperty("鎻愪氦鏃堕棿")
+ private String createTime;
+
+}
diff --git a/src/main/java/com/ycl/jxkg/enums/general/ExamStatusEnum.java b/src/main/java/com/ycl/jxkg/enums/general/ExamStatusEnum.java
new file mode 100644
index 0000000..03037d0
--- /dev/null
+++ b/src/main/java/com/ycl/jxkg/enums/general/ExamStatusEnum.java
@@ -0,0 +1,55 @@
+package com.ycl.jxkg.enums.general;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import com.fasterxml.jackson.annotation.JsonValue;
+import lombok.Getter;
+
+import java.util.Date;
+import java.util.Objects;
+
+/**
+ * 鑰冭瘯鐘舵��
+ *
+ * @author锛歺p
+ * @date锛�2024/6/4 9:35
+ */
+@Getter
+public enum ExamStatusEnum {
+
+ NOT_START("not_start", "鏈紑濮�"),
+ ING("ing", "杩涜涓�"),
+ FINISHED("finished", "宸茬粨鏉�"),
+ ;
+
+ @EnumValue
+ private final String value;
+
+ @JsonValue
+ private final String desc;
+
+ ExamStatusEnum(String value, String desc) {
+ this.value = value;
+ this.desc = desc;
+ }
+
+ /**
+ * 鍒ゆ柇褰撳墠鏃堕棿瀵瑰簲鐨勮�冭瘯鐘舵��
+ *
+ * @param start
+ * @param end
+ * @param now
+ * @return
+ */
+ public static ExamStatusEnum getStatusByTime(Date start, Date end, Date now) {
+ if (Objects.isNull(now)) {
+ now = new Date();
+ }
+ if (now.after(end)) {
+ return FINISHED;
+ } else if (now.before(start)) {
+ return NOT_START;
+ } else {
+ return ING;
+ }
+ }
+}
diff --git a/src/main/java/com/ycl/jxkg/mapper/ExamMapper.java b/src/main/java/com/ycl/jxkg/mapper/ExamMapper.java
new file mode 100644
index 0000000..cb390c3
--- /dev/null
+++ b/src/main/java/com/ycl/jxkg/mapper/ExamMapper.java
@@ -0,0 +1,34 @@
+package com.ycl.jxkg.mapper;
+
+import com.ycl.jxkg.domain.entity.Exam;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ycl.jxkg.domain.query.ExamQuery;
+import com.ycl.jxkg.domain.vo.ExamVO;
+import com.ycl.jxkg.domain.form.ExamForm;
+import java.util.List;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 鑰冭瘯 Mapper 鎺ュ彛
+ *
+ * @author xp
+ * @since 2024-06-11
+ */
+@Mapper
+public interface ExamMapper extends BaseMapper<Exam> {
+
+ /**
+ * id鏌ユ壘鑰冭瘯
+ * @param id
+ * @return
+ */
+ ExamVO getById(Integer id);
+
+ /**
+ * 鍒嗛〉
+ */
+ IPage getPage(IPage page, @Param("query") ExamQuery query);
+
+}
diff --git a/src/main/java/com/ycl/jxkg/service/ClassesService.java b/src/main/java/com/ycl/jxkg/service/ClassesService.java
index b517a84..4e38880 100644
--- a/src/main/java/com/ycl/jxkg/service/ClassesService.java
+++ b/src/main/java/com/ycl/jxkg/service/ClassesService.java
@@ -78,4 +78,12 @@
* @return
*/
Result dissolution(Integer id);
+
+ /**
+ *
+ * 鎴戠殑鐝骇
+ *
+ * @return
+ */
+ Result myClassList();
}
diff --git a/src/main/java/com/ycl/jxkg/service/ExamPaperAnswerService.java b/src/main/java/com/ycl/jxkg/service/ExamPaperAnswerService.java
index e3dc04f..4554736 100644
--- a/src/main/java/com/ycl/jxkg/service/ExamPaperAnswerService.java
+++ b/src/main/java/com/ycl/jxkg/service/ExamPaperAnswerService.java
@@ -55,6 +55,13 @@
PageInfo<ExamPaperAnswerPageResponseVO> adminPage(ExamPaperAnswerPageRequestVO requestVM);
/**
+ * 鎴愮哗鍒楄〃
+ * @param requestVM 鏌ヨ鏉′欢
+ * @return 鏁版嵁
+ */
+ List<ExamPaperAnswerPageResponseVO> list(ExamPaperAnswerPageRequestVO requestVM);
+
+ /**
* 绛斿嵎鍒楄〃
* @param model 鏌ヨ鏉′欢
* @return 鏁版嵁
diff --git a/src/main/java/com/ycl/jxkg/service/ExamPaperService.java b/src/main/java/com/ycl/jxkg/service/ExamPaperService.java
index caa6368..9786fe4 100644
--- a/src/main/java/com/ycl/jxkg/service/ExamPaperService.java
+++ b/src/main/java/com/ycl/jxkg/service/ExamPaperService.java
@@ -32,6 +32,15 @@
List<Integer> selectMothCount();
+ /**
+ *
+ * 鎴戠殑璇曞嵎
+ *
+ * @param paperType
+ * @return
+ */
+ List<ExamPaper> myExamPaper(Integer paperType);
+
void addPaper(ExamPaperForm form);
void updateExamPaper(ExamPaperForm form);
diff --git a/src/main/java/com/ycl/jxkg/service/ExamService.java b/src/main/java/com/ycl/jxkg/service/ExamService.java
new file mode 100644
index 0000000..bf476cd
--- /dev/null
+++ b/src/main/java/com/ycl/jxkg/service/ExamService.java
@@ -0,0 +1,65 @@
+package com.ycl.jxkg.service;
+
+import com.ycl.jxkg.domain.entity.Exam;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ycl.jxkg.base.Result;
+import com.ycl.jxkg.domain.form.ExamForm;
+import com.ycl.jxkg.domain.query.ExamQuery;
+import java.util.List;
+
+/**
+ * 鑰冭瘯 鏈嶅姟绫�
+ *
+ * @author xp
+ * @since 2024-06-11
+ */
+public interface ExamService extends IService<Exam> {
+
+ /**
+ * 娣诲姞
+ * @param form
+ * @return
+ */
+ Result add(ExamForm form);
+
+ /**
+ * 淇敼
+ * @param form
+ * @return
+ */
+ Result update(ExamForm form);
+
+ /**
+ * 鎵归噺鍒犻櫎
+ * @param ids
+ * @return
+ */
+ Result remove(List<String> ids);
+
+ /**
+ * id鍒犻櫎
+ * @param id
+ * @return
+ */
+ Result removeById(String id);
+
+ /**
+ * 鍒嗛〉鏌ヨ
+ * @param query
+ * @return
+ */
+ Result page(ExamQuery query);
+
+ /**
+ * 鏍规嵁id鏌ユ壘
+ * @param id
+ * @return
+ */
+ Result detail(Integer id);
+
+ /**
+ * 鍒楄〃
+ * @return
+ */
+ Result all();
+}
diff --git a/src/main/java/com/ycl/jxkg/service/impl/ClassesServiceImpl.java b/src/main/java/com/ycl/jxkg/service/impl/ClassesServiceImpl.java
index 988eb64..d4b08a9 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/ClassesServiceImpl.java
+++ b/src/main/java/com/ycl/jxkg/service/impl/ClassesServiceImpl.java
@@ -1,7 +1,9 @@
package com.ycl.jxkg.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
+import com.ycl.jxkg.context.WebContext;
import com.ycl.jxkg.domain.entity.Classes;
import com.ycl.jxkg.enums.general.ClassesStatusEnum;
import com.ycl.jxkg.mapper.ClassesMapper;
@@ -31,6 +33,7 @@
public class ClassesServiceImpl extends ServiceImpl<ClassesMapper, Classes> implements ClassesService {
private final ClassesMapper classesMapper;
+ private final WebContext webContext;
/**
* 娣诲姞
@@ -40,6 +43,8 @@
@Override
public Result add(ClassesForm form) {
Classes entity = ClassesForm.getEntityByForm(form, null);
+ entity.setStatus(ClassesStatusEnum.NORMAL);
+ entity.setCreateUser(webContext.getCurrentUser().getId());
baseMapper.insert(entity);
return Result.ok("娣诲姞鎴愬姛");
}
@@ -90,6 +95,7 @@
@Override
public Result page(ClassesQuery query) {
IPage<ClassesVO> page = PageUtil.getPage(query, ClassesVO.class);
+ query.setUserId(webContext.getCurrentUser().getId());
baseMapper.getPage(page, query);
return Result.ok().data(page.getRecords()).total(page.getTotal());
}
@@ -127,4 +133,15 @@
.update();
return Result.ok("瑙ｆ暎鎴愬姛");
}
+
+
+ @Override
+ public Result myClassList() {
+ Integer userId = webContext.getCurrentUser().getId();
+ List<Classes> list = new LambdaQueryChainWrapper<>(baseMapper)
+ .select(Classes::getId, Classes::getClassName)
+ .eq(Classes::getCreateUser, userId)
+ .list();
+ return Result.ok(list);
+ }
}
diff --git a/src/main/java/com/ycl/jxkg/service/impl/ExamPaperAnswerServiceImpl.java b/src/main/java/com/ycl/jxkg/service/impl/ExamPaperAnswerServiceImpl.java
index 8c625a3..6223325 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/ExamPaperAnswerServiceImpl.java
+++ b/src/main/java/com/ycl/jxkg/service/impl/ExamPaperAnswerServiceImpl.java
@@ -271,6 +271,11 @@
}
@Override
+ public List<ExamPaperAnswerPageResponseVO> list(ExamPaperAnswerPageRequestVO requestVM) {
+ return examPaperAnswerMapper.adminPage(requestVM);
+ }
+
+ @Override
public PageInfo<ExamPaperAnswerPageResponseVO> pageExamPaper(ExamPaperAnswerPageRequestVO model) {
return PageHelper.startPage(model.getPageIndex(), model.getPageSize()).doSelectPageInfo(() ->
examPaperAnswerMapper.pageExamPaper(model));
diff --git a/src/main/java/com/ycl/jxkg/service/impl/ExamPaperServiceImpl.java b/src/main/java/com/ycl/jxkg/service/impl/ExamPaperServiceImpl.java
index 0d99bb1..4da4b71 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/ExamPaperServiceImpl.java
+++ b/src/main/java/com/ycl/jxkg/service/impl/ExamPaperServiceImpl.java
@@ -1,8 +1,10 @@
package com.ycl.jxkg.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.jxkg.domain.entity.ExamTemplate;
+import com.ycl.jxkg.context.WebContext;
import com.ycl.jxkg.domain.entity.TextContent;
import com.ycl.jxkg.domain.exam.ExamPaperTempDTO;
import com.ycl.jxkg.domain.form.ExamPaperForm;
@@ -13,6 +15,7 @@
import com.ycl.jxkg.domain.exam.ExamPaperTitleItemObject;
import com.ycl.jxkg.domain.other.KeyValue;
import com.ycl.jxkg.enums.QuestionTypeEnum;
+import com.ycl.jxkg.enums.VisibilityEnum;
import com.ycl.jxkg.enums.VisibilityEnum;
import com.ycl.jxkg.mapper.ExamPaperMapper;
import com.ycl.jxkg.mapper.ExamTemplateMapper;
@@ -44,6 +47,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.Objects;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
@@ -57,6 +61,8 @@
private final QuestionService questionService;
private final SubjectService subjectService;
private final ExamTemplateMapper examTemplateMapper;
+ private final WebContext webContext;
+
@Override
@Transactional(rollbackFor = Exception.class)
@@ -310,5 +316,22 @@
}).collect(Collectors.toList());
}
-
+ @Override
+ public List<ExamPaper> myExamPaper(Integer paperType) {
+ Integer userId = webContext.getCurrentUser().getId();
+ List<ExamPaper> list = new LambdaQueryChainWrapper<>(baseMapper)
+ .select(ExamPaper::getId, ExamPaper::getName, ExamPaper::getVisibility)
+ .eq(ExamPaper::getCreateUser, userId)
+ .eq(Objects.nonNull(paperType), ExamPaper::getPaperType, paperType)
+ .or()
+ .eq(ExamPaper::getVisibility, VisibilityEnum.Public.getName())
+ .eq(Objects.nonNull(paperType), ExamPaper::getPaperType, paperType)
+ .list();
+ list.stream().forEach(item -> {
+ if (VisibilityEnum.Public.getName().equals(item.getVisibility())) {
+ item.setName(item.getName() + " (鍏紑)");
+ }
+ });
+ return list;
+ }
}
diff --git a/src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java b/src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java
new file mode 100644
index 0000000..afbca10
--- /dev/null
+++ b/src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java
@@ -0,0 +1,124 @@
+package com.ycl.jxkg.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ycl.jxkg.context.WebContext;
+import com.ycl.jxkg.domain.entity.Exam;
+import com.ycl.jxkg.enums.general.ExamStatusEnum;
+import com.ycl.jxkg.mapper.ExamMapper;
+import com.ycl.jxkg.service.ExamService;
+import com.ycl.jxkg.base.Result;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ycl.jxkg.domain.form.ExamForm;
+import com.ycl.jxkg.domain.vo.ExamVO;
+import com.ycl.jxkg.domain.query.ExamQuery;
+import org.springframework.stereotype.Service;
+import lombok.RequiredArgsConstructor;
+import com.ycl.jxkg.utils.PageUtil;
+import org.springframework.beans.BeanUtils;
+import org.springframework.util.Assert;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 鑰冭瘯 鏈嶅姟瀹炵幇绫�
+ *
+ * @author xp
+ * @since 2024-06-11
+ */
+@Service
+@RequiredArgsConstructor
+public class ExamServiceImpl extends ServiceImpl<ExamMapper, Exam> implements ExamService {
+
+ private final ExamMapper examMapper;
+ private final WebContext webContext;
+
+ /**
+ * 娣诲姞
+ * @param form
+ * @return
+ */
+ @Override
+ public Result add(ExamForm form) {
+ Exam entity = ExamForm.getEntityByForm(form, null);
+ entity.setStatus(ExamStatusEnum.getStatusByTime(form.getStartTime(), form.getEndTime(), null));
+ entity.setTeacherId(webContext.getCurrentUser().getId());
+ baseMapper.insert(entity);
+ return Result.ok("娣诲姞鎴愬姛");
+ }
+
+ /**
+ * 淇敼
+ * @param form
+ * @return
+ */
+ @Override
+ public Result update(ExamForm form) {
+ Exam entity = baseMapper.selectById(form.getId());
+ // 涓虹┖鎶汭llegalArgumentException锛屽仛鍏ㄥ眬寮傚父澶勭悊
+ Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
+ BeanUtils.copyProperties(form, entity);
+ entity.setStatus(ExamStatusEnum.getStatusByTime(form.getStartTime(), form.getEndTime(), null));
+ baseMapper.updateById(entity);
+ return Result.ok("淇敼鎴愬姛");
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎
+ * @param ids
+ * @return
+ */
+ @Override
+ public Result remove(List<String> ids) {
+ baseMapper.deleteBatchIds(ids);
+ return Result.ok("鍒犻櫎鎴愬姛");
+ }
+
+ /**
+ * id鍒犻櫎
+ * @param id
+ * @return
+ */
+ @Override
+ public Result removeById(String id) {
+ baseMapper.deleteById(id);
+ return Result.ok("鍒犻櫎鎴愬姛");
+ }
+
+ /**
+ * 鍒嗛〉鏌ヨ
+ * @param query
+ * @return
+ */
+ @Override
+ public Result page(ExamQuery query) {
+ IPage<ExamVO> page = PageUtil.getPage(query, ExamVO.class);
+ baseMapper.getPage(page, query);
+ return Result.ok().data(page.getRecords()).total(page.getTotal());
+ }
+
+ /**
+ * 鏍规嵁id鏌ユ壘
+ * @param id
+ * @return
+ */
+ @Override
+ public Result detail(Integer id) {
+ ExamVO vo = baseMapper.getById(id);
+ Assert.notNull(vo, "璁板綍涓嶅瓨鍦�");
+ return Result.ok().data(vo);
+ }
+
+ /**
+ * 鍒楄〃
+ * @return
+ */
+ @Override
+ public Result all() {
+ List<Exam> entities = baseMapper.selectList(null);
+ List<ExamVO> vos = entities.stream()
+ .map(entity -> ExamVO.getVoByEntity(entity, null))
+ .collect(Collectors.toList());
+ return Result.ok().data(vos);
+ }
+}
diff --git a/src/main/java/com/ycl/jxkg/utils/ExcelUtils.java b/src/main/java/com/ycl/jxkg/utils/ExcelUtils.java
new file mode 100644
index 0000000..ff034b1
--- /dev/null
+++ b/src/main/java/com/ycl/jxkg/utils/ExcelUtils.java
@@ -0,0 +1,61 @@
+package com.ycl.jxkg.utils;
+
+import com.alibaba.excel.EasyExcel;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * excel宸ュ叿绫�
+ *
+ * @author gonghl
+ */
+public class ExcelUtils {
+
+ /**
+ * Excel瀵煎嚭
+ *
+ * @param response response
+ * @param fileName 鏂囦欢鍚�
+ * @param sheetName sheetName
+ * @param list 鏁版嵁List
+ * @param pojoClass 瀵硅薄Class
+ */
+ public static void exportExcel(HttpServletResponse response, String fileName, String sheetName, List<?> list, Class<?> pojoClass) throws IOException {
+ if (StringUtils.isBlank(fileName)) {
+ fileName = Long.toString(System.currentTimeMillis());
+ }
+
+ response.setContentType("application/vnd.ms-excel");
+ response.setCharacterEncoding("UTF-8");
+ fileName = URLEncoder.encode(fileName, "UTF-8");
+ response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
+ EasyExcel.write(response.getOutputStream(), pojoClass).sheet(sheetName).doWrite(list);
+ }
+
+ /**
+ * Excel瀵煎嚭锛屽厛sourceList杞崲鎴怢ist<targetClass>锛屽啀瀵煎嚭
+ *
+ * @param response response
+ * @param fileName 鏂囦欢鍚�
+ * @param sheetName sheetName
+ * @param sourceList 鍘熸暟鎹甃ist
+ * @param targetClass 鐩爣瀵硅薄Class
+ */
+ public static void exportExcelToTarget(HttpServletResponse response, String fileName, String sheetName, List<?> sourceList, Class<?> targetClass) throws Exception {
+ List<Object> targetList = new ArrayList<>(sourceList.size());
+ for (Object source : sourceList) {
+ Object target = targetClass.newInstance();
+ BeanUtils.copyProperties(source, target);
+ targetList.add(target);
+ }
+
+ exportExcel(response, fileName, sheetName, targetList, targetClass);
+ }
+
+}
diff --git a/src/main/resources/mapper/ClassesMapper.xml b/src/main/resources/mapper/ClassesMapper.xml
index 2481ae5..302924c 100644
--- a/src/main/resources/mapper/ClassesMapper.xml
+++ b/src/main/resources/mapper/ClassesMapper.xml
@@ -63,7 +63,7 @@
t_classes TC
LEFT JOIN t_user TU ON TU.id = TC.create_user AND TU.deleted = 0
WHERE
- TC.deleted = 0
+ TC.deleted = 0 AND TC.create_user = #{query.userId}
<if test="query.className != null and query.className != ''">
AND TC.class_name like concat('%', #{query.className}, '%')
</if>
diff --git a/src/main/resources/mapper/ExamMapper.xml b/src/main/resources/mapper/ExamMapper.xml
new file mode 100644
index 0000000..62d1c81
--- /dev/null
+++ b/src/main/resources/mapper/ExamMapper.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ycl.jxkg.mapper.ExamMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.ycl.jxkg.domain.vo.ExamVO">
+ <result column="exam_name" property="examName" />
+ <result column="exam_paper_id" property="examPaperId" />
+ <result column="classes_id" property="classesId" />
+ <result column="exam_paper_type" property="examPaperType" />
+ <result column="exam_place" property="examPlace" />
+ <result column="status" property="status" />
+ <result column="start_time" property="startTime" />
+ <result column="end_time" property="endTime" />
+ <result column="create_time" property="createTime" />
+ <result column="teacher_id" property="teacherId" />
+ <result column="class_name" property="className" />
+ <result column="name" property="examPaperName" />
+ </resultMap>
+
+
+
+
+
+
+
+ <select id="getById" resultMap="BaseResultMap">
+ SELECT
+ TE.exam_name,
+ TE.exam_paper_id,
+ TE.classes_id,
+ TE.exam_paper_type,
+ TE.exam_place,
+ TE.status,
+ TE.start_time,
+ TE.end_time,
+ TE.create_time,
+ TE.teacher_id,
+ TE.id
+ FROM
+ t_exam TE
+ WHERE
+ TE.id = #{id} AND TE.deleted = 0
+ </select>
+
+
+ <select id="getPage" resultMap="BaseResultMap">
+ SELECT
+ TE.exam_name,
+ TE.exam_paper_id,
+ TE.classes_id,
+ TE.exam_paper_type,
+ TE.exam_place,
+ TE.status,
+ TE.start_time,
+ TE.end_time,
+ TE.create_time,
+ TE.teacher_id,
+ TE.id,
+ TC.class_name,
+ TEP.name
+ FROM
+ t_exam TE
+ INNER JOIN t_user TU ON TU.id = TE.teacher_id AND TU.deleted = 0
+ INNER JOIN t_classes TC ON TC.id = TE.classes_id AND TC.deleted = 0
+ INNER JOIN t_exam_paper TEP ON TEP.id = TE.exam_paper_id AND TEP.deleted = 0
+ WHERE
+ TE.deleted = 0
+ <if test="query.examName != null and query.examName != ''">
+ AND TE.exam_name like concat('%', #{query.examName}, '%')
+ </if>
+ <if test="query.classesId != null">
+ AND TE.classes_id = #{query.classesId}
+ </if>
+ </select>
+
+</mapper>
--
Gitblit v1.8.0