From 74b520065c267999e6a4cd61c8f7b0d516931f07 Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期二, 11 六月 2024 11:40:33 +0800 Subject: [PATCH] 考试管理 --- src/main/java/com/ycl/jxkg/controller/admin/ExamPaperController.java | 8 src/main/java/com/ycl/jxkg/service/ClassesService.java | 8 src/main/java/com/ycl/jxkg/domain/vo/ExamVO.java | 60 +++++ src/main/java/com/ycl/jxkg/service/impl/ClassesServiceImpl.java | 14 + src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java | 119 ++++++++++ src/main/java/com/ycl/jxkg/service/ExamPaperService.java | 9 src/main/java/com/ycl/jxkg/domain/entity/Exam.java | 59 +++++ src/main/java/com/ycl/jxkg/domain/form/ExamForm.java | 62 +++++ src/main/java/com/ycl/jxkg/controller/admin/ExamController.java | 83 +++++++ src/main/java/com/ycl/jxkg/domain/query/ExamQuery.java | 22 ++ src/main/java/com/ycl/jxkg/mapper/ExamMapper.java | 34 +++ src/main/java/com/ycl/jxkg/service/ExamService.java | 65 +++++ src/main/resources/mapper/ExamMapper.xml | 64 +++++ src/main/java/com/ycl/jxkg/controller/admin/ClassesController.java | 7 src/main/java/com/ycl/jxkg/service/impl/ExamPaperServiceImpl.java | 24 ++ 15 files changed, 637 insertions(+), 1 deletions(-) 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/ExamPaperController.java b/src/main/java/com/ycl/jxkg/controller/admin/ExamPaperController.java index e51a998..eb27aa8 100644 --- a/src/main/java/com/ycl/jxkg/controller/admin/ExamPaperController.java +++ b/src/main/java/com/ycl/jxkg/controller/admin/ExamPaperController.java @@ -23,6 +23,8 @@ import javax.validation.Valid; import java.util.Date; +import java.util.List; + @Validated @RequiredArgsConstructor @RestController("AdminExamPaperController") @@ -81,4 +83,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/Exam.java b/src/main/java/com/ycl/jxkg/domain/entity/Exam.java new file mode 100644 index 0000000..c5f9cbb --- /dev/null +++ b/src/main/java/com/ycl/jxkg/domain/entity/Exam.java @@ -0,0 +1,59 @@ +package com.ycl.jxkg.domain.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import java.time.LocalDateTime; + +import com.ycl.jxkg.domain.base.AbsEntity; +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 String examPaperType; + + @TableField("exam_place") + /** 鑰冭瘯鍦扮偣 */ + private String examPlace; + + @TableField("status") + /** 鑰冭瘯鐘舵�� */ + private String status; + + @TableField("start_time") + /** 寮�濮嬫椂闂� */ + private LocalDateTime startTime; + + @TableField("end_time") + /** 缁撴潫鏃堕棿 */ + private LocalDateTime endTime; + + @TableField("teacher_id") + /** 鍒涘缓鑰佸笀 */ + private Integer teacherId; + + +} 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..c8c20bf --- /dev/null +++ b/src/main/java/com/ycl/jxkg/domain/form/ExamForm.java @@ -0,0 +1,62 @@ +package com.ycl.jxkg.domain.form; + +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; + + @NotBlank(message = "璇曞嵎绫诲瀷涓嶈兘涓虹┖", groups = {Add.class, Update.class}) + @ApiModelProperty("璇曞嵎绫诲瀷") + private String examPaperType; + + @NotBlank(message = "鑰冭瘯鍦扮偣涓嶈兘涓虹┖", groups = {Add.class, Update.class}) + @ApiModelProperty("鑰冭瘯鍦扮偣") + private String examPlace; + + @NotNull(message = "寮�濮嬫椂闂翠笉鑳戒负绌�", groups = {Add.class, Update.class}) + @ApiModelProperty("寮�濮嬫椂闂�") + private Date startTime; + + @NotNull(message = "缁撴潫鏃堕棿涓嶈兘涓虹┖", groups = {Add.class, Update.class}) + @ApiModelProperty("缁撴潫鏃堕棿") + 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/ExamQuery.java b/src/main/java/com/ycl/jxkg/domain/query/ExamQuery.java new file mode 100644 index 0000000..cd0905a --- /dev/null +++ b/src/main/java/com/ycl/jxkg/domain/query/ExamQuery.java @@ -0,0 +1,22 @@ +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 { +} + 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..5054d4c --- /dev/null +++ b/src/main/java/com/ycl/jxkg/domain/vo/ExamVO.java @@ -0,0 +1,60 @@ +package com.ycl.jxkg.domain.vo; + +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; + + /** 鐝骇ID */ + private Integer classesId; + + /** 璇曞嵎绫诲瀷 */ + private String examPaperType; + + /** 鑰冭瘯鍦扮偣 */ + private String examPlace; + + /** 鑰冭瘯鐘舵�� */ + private String status; + + /** 寮�濮嬫椂闂� */ + private Date startTime; + + /** 缁撴潫鏃堕棿 */ + private Date endTime; + + /** 鍒涘缓鏃堕棿 */ + 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/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/ExamPaperService.java b/src/main/java/com/ycl/jxkg/service/ExamPaperService.java index d8ee7dd..4ab31a0 100644 --- a/src/main/java/com/ycl/jxkg/service/ExamPaperService.java +++ b/src/main/java/com/ycl/jxkg/service/ExamPaperService.java @@ -29,4 +29,13 @@ Integer selectAllCount(); List<Integer> selectMothCount(); + + /** + * + * 鎴戠殑璇曞嵎 + * + * @param paperType + * @return + */ + List<ExamPaper> myExamPaper(Integer paperType); } 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..c93615e 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; /** * 娣诲姞 @@ -127,4 +130,15 @@ .update(); return Result.ok("瑙f暎鎴愬姛"); } + + + @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/ExamPaperServiceImpl.java b/src/main/java/com/ycl/jxkg/service/impl/ExamPaperServiceImpl.java index f661b55..1060ffd 100644 --- a/src/main/java/com/ycl/jxkg/service/impl/ExamPaperServiceImpl.java +++ b/src/main/java/com/ycl/jxkg/service/impl/ExamPaperServiceImpl.java @@ -1,11 +1,14 @@ package com.ycl.jxkg.service.impl; +import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ycl.jxkg.context.WebContext; import com.ycl.jxkg.domain.entity.TextContent; import com.ycl.jxkg.enums.ExamPaperTypeEnum; import com.ycl.jxkg.domain.exam.ExamPaperQuestionItemObject; import com.ycl.jxkg.domain.exam.ExamPaperTitleItemObject; import com.ycl.jxkg.domain.other.KeyValue; +import com.ycl.jxkg.enums.VisibilityEnum; import com.ycl.jxkg.mapper.ExamPaperMapper; import com.ycl.jxkg.mapper.QuestionMapper; import com.ycl.jxkg.service.ExamPaperService; @@ -32,6 +35,7 @@ import java.util.Date; import java.util.List; +import java.util.Objects; import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; @@ -44,6 +48,7 @@ private final TextContentService textContentService; private final QuestionService questionService; private final SubjectService subjectService; + private final WebContext webContext; @Override @@ -191,5 +196,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..378a11c --- /dev/null +++ b/src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java @@ -0,0 +1,119 @@ +package com.ycl.jxkg.service.impl; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.ycl.jxkg.domain.entity.Exam; +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; + + /** + * 娣诲姞 + * @param form + * @return + */ + @Override + public Result add(ExamForm form) { + Exam entity = ExamForm.getEntityByForm(form, null); + 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); + 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/resources/mapper/ExamMapper.xml b/src/main/resources/mapper/ExamMapper.xml new file mode 100644 index 0000000..4961fc1 --- /dev/null +++ b/src/main/resources/mapper/ExamMapper.xml @@ -0,0 +1,64 @@ +<?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" /> + </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 + FROM + t_exam TE + WHERE + TE.deleted = 0 + </select> + +</mapper> -- Gitblit v1.8.0