From 528b1892d8e929b199dddc96f3a43f9b8039c8c8 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 06 六月 2024 18:00:42 +0800
Subject: [PATCH] 模板接口打通
---
src/main/java/com/ycl/jxkg/domain/enums/DeductTypeEnum.java | 4
src/main/java/com/ycl/jxkg/domain/vo/ExamTemplateVO.java | 92 +++++++++++
src/main/java/com/ycl/jxkg/controller/admin/ExamTemplateController.java | 34 +--
src/main/resources/mapper/ExamTemplateMapper.xml | 42 ++++
src/main/java/com/ycl/jxkg/service/impl/ExamTemplateServiceImpl.java | 32 +--
src/main/resources/logback-spring.xml | 2
src/main/java/com/ycl/jxkg/domain/entity/ExamTemplate.java | 83 ++++++----
src/main/java/com/ycl/jxkg/domain/query/ExamTemplateQuery.java | 11 +
src/main/java/com/ycl/jxkg/domain/enums/VisibilityEnum.java | 25 ++-
src/main/java/com/ycl/jxkg/mapper/ExamTemplateMapper.java | 12
src/main/java/com/ycl/jxkg/service/ExamTemplateService.java | 7
src/main/java/com/ycl/jxkg/domain/form/ExamTemplateForm.java | 100 +++---------
src/main/java/com/ycl/jxkg/domain/question/TemplateQuestionDTO.java | 11 +
13 files changed, 279 insertions(+), 176 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/controller/admin/ExamTemplateController.java b/src/main/java/com/ycl/jxkg/controller/admin/ExamTemplateController.java
index 4ea99c1..be8a3ad 100644
--- a/src/main/java/com/ycl/jxkg/controller/admin/ExamTemplateController.java
+++ b/src/main/java/com/ycl/jxkg/controller/admin/ExamTemplateController.java
@@ -1,80 +1,74 @@
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.ExamTemplateService;
import com.ycl.jxkg.base.Result;
import com.ycl.jxkg.domain.form.ExamTemplateForm;
import com.ycl.jxkg.domain.query.ExamTemplateQuery;
-import com.ycl.jxkg.group.Add;
-import com.ycl.jxkg.group.Update;
-import com.ycl.jxkg.service.ExamTemplateService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
-
-import javax.validation.constraints.NotEmpty;
-import java.util.List;
/**
* 闅忔満璇曞嵎妯℃澘 鍓嶇鎺у埗鍣�
*
- * @author 寮�鍙戜汉鍛樺悕瀛�
- * @since 2024-06-03
+ * @author flq
+ * @since 2024-06-05
*/
@Validated
@RequiredArgsConstructor
@Api(value = "闅忔満璇曞嵎妯℃澘", tags = "闅忔満璇曞嵎妯℃澘绠＄悊")
@RestController
-@RequestMapping("/exam-template")
+@RequestMapping("/api/admin/exam-template")
public class ExamTemplateController {
private final ExamTemplateService examTemplateService;
@PostMapping
@ApiOperation(value = "娣诲姞", notes = "娣诲姞")
- @PreAuthorize("hasAuthority('examTemplate:add')")
public Result add(@RequestBody @Validated(Add.class) ExamTemplateForm form) {
return examTemplateService.add(form);
}
@PutMapping
@ApiOperation(value = "淇敼", notes = "淇敼")
- @PreAuthorize("hasAuthority('examTemplate:edit')")
public Result update(@RequestBody @Validated(Update.class) ExamTemplateForm form) {
return examTemplateService.update(form);
}
@DeleteMapping("/{id}")
@ApiOperation(value = "ID鍒犻櫎", notes = "ID鍒犻櫎")
- @PreAuthorize("hasAuthority('examTemplate:del')")
public Result removeById(@PathVariable("id") String id) {
return examTemplateService.removeById(id);
}
@DeleteMapping("/batch")
@ApiOperation(value = "鎵归噺鍒犻櫎", notes = "鎵归噺鍒犻櫎")
- @PreAuthorize("hasAuthority('examTemplate:del:batch')")
public Result remove(@RequestBody @NotEmpty(message = "璇烽�夋嫨鏁版嵁") List<String> ids) {
return examTemplateService.remove(ids);
}
@GetMapping("/page")
@ApiOperation(value = "鍒嗛〉", notes = "鍒嗛〉")
- @PreAuthorize("hasAuthority('examTemplate:page')")
public Result page(ExamTemplateQuery query) {
return examTemplateService.page(query);
}
@GetMapping("/{id}")
@ApiOperation(value = "璇︽儏", notes = "璇︽儏")
- @PreAuthorize("hasAuthority('examTemplate:detail')")
public Result detail(@PathVariable("id") Integer id) {
return examTemplateService.detail(id);
}
@GetMapping("/list")
- @PreAuthorize("hasAuthority('examTemplate:list')")
@ApiOperation(value = "鍒楄〃", notes = "鍒楄〃")
public Result list() {
return examTemplateService.all();
diff --git a/src/main/java/com/ycl/jxkg/domain/entity/ExamTemplate.java b/src/main/java/com/ycl/jxkg/domain/entity/ExamTemplate.java
index 8279fd2..b3f3ce9 100644
--- a/src/main/java/com/ycl/jxkg/domain/entity/ExamTemplate.java
+++ b/src/main/java/com/ycl/jxkg/domain/entity/ExamTemplate.java
@@ -3,80 +3,97 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ycl.jxkg.domain.base.AbsEntity;
-import io.swagger.models.auth.In;
import lombok.Data;
import java.math.BigDecimal;
-import java.util.Date;
+
/**
- * 闅忔満璇曞嵎妯℃澘琛�
- * */
+ * 闅忔満璇曞嵎妯℃澘
+ *
+ * @author flq
+ * @since 2024-06-05
+ */
@Data
@TableName("t_exam_template")
public class ExamTemplate extends AbsEntity {
- /**
- * 璇曞嵎id
- * */
- @TableField("exam_paper_id")
- private Integer examPaperId;
- /**
- * 鍗曢�夐鏁伴噺
- * */
+ private static final long serialVersionUID = 1L;
+
+ @TableField("name")
+ /** 妯℃澘鍚� */
+ private String name;
+
+ @TableField("subject_id")
+ /** 瀛︾id */
+ private Integer subjectId;
+
+ @TableField("score")
+ /** 鎬诲垎 */
+ private Integer score;
+
+ @TableField("visibility")
+ /** 鏄惁绉佹湁 */
+ private String visibility;
+
+ @TableField("suggest_time")
+ /** 寤鸿鏃堕棿 */
+ private Integer suggestTime;
+
+ @TableField("deduct_type")
+ /** 澶氶�夋墸鍒嗙被鍨� */
+ private Integer deductType;
+
@TableField("single_choice")
+ /** 鍗曢�夐鏁伴噺 */
private Integer singleChoice;
- /**
- * 澶氶�夐鏁伴噺
- * */
@TableField("multiple_choice")
+ /** 澶氶�夐鏁伴噺 */
private Integer multipleChoice;
- /**
- * 濉┖棰樻暟閲�
- * */
@TableField("gap_filling")
+ /** 濉┖棰樻暟閲� */
private Integer gapFilling;
- /**
- * 鍒ゆ柇棰樻暟閲�
- * */
@TableField("true_false")
+ /** 鍒ゆ柇鏁伴噺 */
private Integer trueFalse;
- /**
- * 绠�绛旈鏁伴噺
- * */
@TableField("short_answer")
+ /** 绠�绛旈鏁伴噺 */
private Integer shortAnswer;
- /**
- * 璁＄畻棰樻暟閲�
- * */
@TableField("calculation")
+ /** 璁＄畻棰樻暟閲� */
private Integer calculation;
- /** 鍗曢�夋瘡棰樺垎鏁� */
@TableField("single_score")
+ /** 鍗曢�夋瘡棰樺垎鏁� */
private BigDecimal singleScore;
- /** 澶氶�夋瘡棰樺垎鏁� */
@TableField("multiple_score")
+ /** 澶氶�夋瘡棰樺垎鏁� */
private BigDecimal multipleScore;
- /** 濉┖姣忛鍒嗘暟 */
@TableField("gap_score")
+ /** 濉┖姣忛鍒嗘暟 */
private BigDecimal gapScore;
+ @TableField("true_false_score")
/** 鍒ゆ柇姣忛鍒嗘暟 */
- @TableField("trueFalse_score")
private BigDecimal trueFalseScore;
+ @TableField("short_answer_score")
/** 绠�绛旀瘡棰樺垎鏁� */
- @TableField("shortAnswer_score")
private BigDecimal shortAnswerScore;
+ @TableField("calculation__score")
/** 璁＄畻姣忛鍒嗘暟 */
- @TableField("calculation_score")
private BigDecimal calculationScore;
+
+ @TableField("create_user")
+ /** */
+ private Integer createUser;
+
+
}
diff --git a/src/main/java/com/ycl/jxkg/domain/enums/DeductTypeEnum.java b/src/main/java/com/ycl/jxkg/domain/enums/DeductTypeEnum.java
index 31f7d09..9830264 100644
--- a/src/main/java/com/ycl/jxkg/domain/enums/DeductTypeEnum.java
+++ b/src/main/java/com/ycl/jxkg/domain/enums/DeductTypeEnum.java
@@ -6,8 +6,8 @@
public enum DeductTypeEnum {
AllCorrect(1, "绛旈敊涓嶅緱鍒�"),
- PartCorrect(2, "婕忛�夊緱鍥哄畾鍒嗗�硷紝鍖呭惈閿欒閫夐」涓嶅緱鍒�"),
- EachCorrect(3, "姣忓涓�棰樺緱鐩稿簲鍒嗗�硷紝鍖呭惈閿欒閫夐」涓嶅緱鍒�");
+ PartCorrect(2, "婕忛�夊緱鍥哄畾鍒嗗��,鍖呭惈閿欒閫夐」涓嶅緱鍒�"),
+ EachCorrect(3, "姣忓涓�棰樺緱鐩稿簲鍒嗗��,鍖呭惈閿欒閫夐」涓嶅緱鍒�");
int code;
String name;
diff --git a/src/main/java/com/ycl/jxkg/domain/enums/VisibilityEnum.java b/src/main/java/com/ycl/jxkg/domain/enums/VisibilityEnum.java
index 5606948..d5bea92 100644
--- a/src/main/java/com/ycl/jxkg/domain/enums/VisibilityEnum.java
+++ b/src/main/java/com/ycl/jxkg/domain/enums/VisibilityEnum.java
@@ -4,13 +4,14 @@
import java.util.Map;
public enum VisibilityEnum {
- Private("绉佹湁", "鍙湁鑰佸笀鑷繁鑳界湅"),
- Public("鍏紑", "鎵�鏈変汉鑳界湅");
-
+ Private(1,"PRIVATE", "鍙湁鑰佸笀鑷繁鑳界湅"),
+ Public(2,"PUBLIC", "鎵�鏈変汉鑳界湅");
+ Integer code;
String name;
String description;
- VisibilityEnum(String name, String description) {
+ VisibilityEnum(Integer code,String name, String description) {
+ this.code = code;
this.name = name;
this.description = description;
}
@@ -31,17 +32,23 @@
this.name = name;
}
+ public Integer getCode() {
+ return code;
+ }
- private static final Map<String, VisibilityEnum> keyMap = new HashMap<>();
+ public void setCode(Integer code) {
+ this.code = code;
+ }
+
+ private static final Map<Integer, VisibilityEnum> keyMap = new HashMap<>();
static {
for (VisibilityEnum item : VisibilityEnum.values()) {
- keyMap.put(item.getName(), item);
+ keyMap.put(item.getCode(), item);
}
}
-
- public static VisibilityEnum fromCode(String name) {
- return keyMap.get(name);
+ public static VisibilityEnum fromCode(Integer code) {
+ return keyMap.get(code);
}
}
diff --git a/src/main/java/com/ycl/jxkg/domain/form/ExamTemplateForm.java b/src/main/java/com/ycl/jxkg/domain/form/ExamTemplateForm.java
index 5e90b25..af2310f 100644
--- a/src/main/java/com/ycl/jxkg/domain/form/ExamTemplateForm.java
+++ b/src/main/java/com/ycl/jxkg/domain/form/ExamTemplateForm.java
@@ -1,105 +1,55 @@
package com.ycl.jxkg.domain.form;
+import com.ycl.jxkg.domain.question.TemplateQuestionDTO;
+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.ExamTemplate;
-import com.ycl.jxkg.group.Add;
-import com.ycl.jxkg.group.Update;
+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 org.springframework.beans.BeanUtils;
-import org.springframework.lang.NonNull;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
-import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
/**
* 闅忔満璇曞嵎妯℃澘琛ㄥ崟
*
- * @author 寮�鍙戜汉鍛樺悕瀛�
- * @since 2024-06-03
+ * @author flq
+ * @since 2024-06-05
*/
@Data
@ApiModel(value = "ExamTemplate琛ㄥ崟", description = "闅忔満璇曞嵎妯℃澘琛ㄥ崟")
public class ExamTemplateForm extends AbsForm {
- @NotBlank(message = "妯℃澘鍚嶇О涓嶈兘涓虹┖", groups = {Add.class, Update.class})
- @ApiModelProperty("妯℃澘鍚嶇О")
+ @NotBlank(message = "妯℃澘鍚嶄笉鑳戒负绌�", groups = {Add.class, Update.class})
+ @ApiModelProperty("妯℃澘鍚�")
private String name;
- @NotNull(message = "璇曞嵎绉戠洰涓嶈兘涓虹┖", groups = {Add.class, Update.class})
- @ApiModelProperty("璇曞嵎绉戠洰")
+ @NotNull(message = "瀛︾id涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+ @ApiModelProperty("瀛︾id")
private Integer subjectId;
- @NotNull(message = "鑰冭瘯鏃堕暱(鍒嗛挓)涓嶈兘涓虹┖", groups = {Add.class, Update.class})
- @ApiModelProperty("鑰冭瘯鏃堕暱(鍒嗛挓)")
- private Integer suggestTime;
-
- @NotNull(message = "鍗曢�夐鏁伴噺涓嶈兘涓虹┖", groups = {Add.class, Update.class})
- @ApiModelProperty("鍗曢�夐鏁伴噺")
- private Integer singleChoice;
-
- @NotNull(message = "澶氶�夐鏁伴噺涓嶈兘涓虹┖", groups = {Add.class, Update.class})
- @ApiModelProperty("澶氶�夐鏁伴噺")
- private Integer multipleChoice;
-
- @NotNull(message = "濉┖棰樻暟閲忎笉鑳戒负绌�", groups = {Add.class, Update.class})
- @ApiModelProperty("濉┖棰樻暟閲�")
- private Integer gapFilling;
-
- @NotNull(message = "鍒ゆ柇鏁伴噺涓嶈兘涓虹┖", groups = {Add.class, Update.class})
- @ApiModelProperty("鍒ゆ柇鏁伴噺")
- private Integer trueFalse;
-
- @NotNull(message = "绠�绛旈鏁伴噺涓嶈兘涓虹┖", groups = {Add.class, Update.class})
- @ApiModelProperty("绠�绛旈鏁伴噺")
- private Integer shortAnswer;
-
- @NotNull(message = "璁＄畻棰樻暟閲忎笉鑳戒负绌�", groups = {Add.class, Update.class})
- @ApiModelProperty("璁＄畻棰樻暟閲�")
- private Integer calculation;
-
- @NotNull(message = "璇曞嵎鎬诲垎涓嶈兘涓虹┖", groups = {Add.class, Update.class})
- @ApiModelProperty("璇曞嵎鎬诲垎")
+ @ApiModelProperty("鎬诲垎")
private Integer score;
- @NotBlank(message = "澶氶�夐鎵ｅ垎鏂瑰紡涓嶈兘涓虹┖", groups = {Add.class, Update.class})
- @ApiModelProperty("澶氶�夐鎵ｅ垎鏂瑰紡")
- private String deductType;
+ @ApiModelProperty("鏄惁绉佹湁")
+ private String visibility;
- @NotNull(message = "鍒涘缓浜轰笉鑳戒负绌�", groups = {Add.class, Update.class})
- @ApiModelProperty("鍒涘缓浜�")
- private Integer createUser;
+ @NotNull(message = "寤鸿鏃堕棿涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+ @ApiModelProperty("寤鸿鏃堕棿")
+ private Integer suggestTime;
- @NotNull(message = "鍒涘缓鏃堕棿涓嶈兘涓虹┖", groups = {Add.class, Update.class})
- @ApiModelProperty("鍒涘缓鏃堕棿")
- private LocalDateTime createTime;
+ @ApiModelProperty("澶氶�夋墸鍒嗙被鍨�")
+ private Integer deductType;
- @NotNull(message = "涓嶈兘涓虹┖", groups = {Add.class, Update.class})
- @ApiModelProperty("")
- private BigDecimal singleScore;
-
- @NotNull(message = "涓嶈兘涓虹┖", groups = {Add.class, Update.class})
- @ApiModelProperty("")
- private BigDecimal multipleScore;
-
- @NotNull(message = "涓嶈兘涓虹┖", groups = {Add.class, Update.class})
- @ApiModelProperty("")
- private BigDecimal gapScore;
-
- @NotNull(message = "涓嶈兘涓虹┖", groups = {Add.class, Update.class})
- @ApiModelProperty("")
- private BigDecimal trueFalseScore;
-
- @NotNull(message = "涓嶈兘涓虹┖", groups = {Add.class, Update.class})
- @ApiModelProperty("")
- private BigDecimal shortAnswerScore;
-
- @NotNull(message = "涓嶈兘涓虹┖", groups = {Add.class, Update.class})
- @ApiModelProperty("")
- private BigDecimal calculationScore;
+ @ApiModelProperty("棰樼洰妯℃澘")
+ private List<TemplateQuestionDTO> questionList;
public static ExamTemplate getEntityByForm(@NonNull ExamTemplateForm form, ExamTemplate entity) {
if(entity == null) {
diff --git a/src/main/java/com/ycl/jxkg/domain/query/ExamTemplateQuery.java b/src/main/java/com/ycl/jxkg/domain/query/ExamTemplateQuery.java
index b61ccc3..d610456 100644
--- a/src/main/java/com/ycl/jxkg/domain/query/ExamTemplateQuery.java
+++ b/src/main/java/com/ycl/jxkg/domain/query/ExamTemplateQuery.java
@@ -1,17 +1,24 @@
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 寮�鍙戜汉鍛樺悕瀛�
- * @since 2024-06-03
+ * @author flq
+ * @since 2024-06-05
*/
@Data
@ApiModel(value = "ExamTemplate鏌ヨ", description = "闅忔満璇曞嵎妯℃澘鏌ヨ")
public class ExamTemplateQuery extends AbsQuery {
+ private String name;
+ private Integer subjectId;
}
diff --git a/src/main/java/com/ycl/jxkg/domain/question/TemplateQuestionDTO.java b/src/main/java/com/ycl/jxkg/domain/question/TemplateQuestionDTO.java
new file mode 100644
index 0000000..119a35c
--- /dev/null
+++ b/src/main/java/com/ycl/jxkg/domain/question/TemplateQuestionDTO.java
@@ -0,0 +1,11 @@
+package com.ycl.jxkg.domain.question;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+@Data
+public class TemplateQuestionDTO {
+ private Integer questionType;
+ private Integer num;
+ private BigDecimal score;
+}
diff --git a/src/main/java/com/ycl/jxkg/domain/vo/ExamTemplateVO.java b/src/main/java/com/ycl/jxkg/domain/vo/ExamTemplateVO.java
new file mode 100644
index 0000000..112047e
--- /dev/null
+++ b/src/main/java/com/ycl/jxkg/domain/vo/ExamTemplateVO.java
@@ -0,0 +1,92 @@
+package com.ycl.jxkg.domain.vo;
+
+import com.ycl.jxkg.domain.base.AbsVo;
+import com.ycl.jxkg.domain.entity.ExamTemplate;
+
+import java.math.BigDecimal;
+import java.util.Date;
+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;
+
+/**
+ * 闅忔満璇曞嵎妯℃澘灞曠ず
+ *
+ * @author flq
+ * @since 2024-06-05
+ */
+@Data
+public class ExamTemplateVO extends AbsVo {
+
+ /** 妯℃澘鍚� */
+ private String name;
+
+ /** 瀛︾id */
+ private Integer subjectId;
+
+ /** 鎬诲垎 */
+ private Integer score;
+
+ /** 鏄惁绉佹湁 */
+ private String visibility;
+
+ /** 寤鸿鏃堕棿 */
+ private Integer suggestTime;
+
+ /** 澶氶�夋墸鍒嗙被鍨� */
+ private Integer deductType;
+
+ /** 鍗曢�夐鏁伴噺 */
+ private Integer singleChoice;
+
+ /** 澶氶�夐鏁伴噺 */
+ private Integer multipleChoice;
+
+ /** 濉┖棰樻暟閲� */
+ private Integer gapFilling;
+
+ /** 鍒ゆ柇鏁伴噺 */
+ private Integer trueFalse;
+
+ /** 绠�绛旈鏁伴噺 */
+ private Integer shortAnswer;
+
+ /** 璁＄畻棰樻暟閲� */
+ private Integer calculation;
+
+ /** 鍗曢�夋瘡棰樺垎鏁� */
+ private BigDecimal singleScore;
+
+ /** 澶氶�夋瘡棰樺垎鏁� */
+ private BigDecimal multipleScore;
+
+ /** 濉┖姣忛鍒嗘暟 */
+ private BigDecimal gapScore;
+
+ /** 鍒ゆ柇姣忛鍒嗘暟 */
+ private BigDecimal trueFalseScore;
+
+ /** 绠�绛旀瘡棰樺垎鏁� */
+ private BigDecimal shortAnswerScore;
+
+ /** 璁＄畻姣忛鍒嗘暟 */
+ private BigDecimal calculationScore;
+
+ /** */
+ private Integer createUser;
+
+ /** */
+ private Date createTime;
+
+ public static ExamTemplateVO getVoByEntity(@NonNull ExamTemplate entity, ExamTemplateVO vo) {
+ if(vo == null) {
+ vo = new ExamTemplateVO();
+ }
+ BeanUtils.copyProperties(entity, vo);
+ return vo;
+ }
+
+}
diff --git a/src/main/java/com/ycl/jxkg/mapper/ExamTemplateMapper.java b/src/main/java/com/ycl/jxkg/mapper/ExamTemplateMapper.java
index 7d7e546..614391c 100644
--- a/src/main/java/com/ycl/jxkg/mapper/ExamTemplateMapper.java
+++ b/src/main/java/com/ycl/jxkg/mapper/ExamTemplateMapper.java
@@ -1,18 +1,20 @@
package com.ycl.jxkg.mapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ycl.jxkg.domain.entity.ExamTemplate;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ycl.jxkg.domain.query.ExamTemplateQuery;
-import com.ycl.jxkg.domain.vo.admin.exam.ExamTemplateVO;
+import com.ycl.jxkg.domain.vo.ExamTemplateVO;
+import com.ycl.jxkg.domain.form.ExamTemplateForm;
+import java.util.List;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
/**
* 闅忔満璇曞嵎妯℃澘 Mapper 鎺ュ彛
*
- * @author 寮�鍙戜汉鍛樺悕瀛�
- * @since 2024-06-03
+ * @author flq
+ * @since 2024-06-05
*/
@Mapper
public interface ExamTemplateMapper extends BaseMapper<ExamTemplate> {
diff --git a/src/main/java/com/ycl/jxkg/service/ExamTemplateService.java b/src/main/java/com/ycl/jxkg/service/ExamTemplateService.java
index dc2c864..cf61604 100644
--- a/src/main/java/com/ycl/jxkg/service/ExamTemplateService.java
+++ b/src/main/java/com/ycl/jxkg/service/ExamTemplateService.java
@@ -1,18 +1,17 @@
package com.ycl.jxkg.service;
+import com.ycl.jxkg.domain.entity.ExamTemplate;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.jxkg.base.Result;
-import com.ycl.jxkg.domain.entity.ExamTemplate;
import com.ycl.jxkg.domain.form.ExamTemplateForm;
import com.ycl.jxkg.domain.query.ExamTemplateQuery;
-
import java.util.List;
/**
* 闅忔満璇曞嵎妯℃澘 鏈嶅姟绫�
*
- * @author 寮�鍙戜汉鍛樺悕瀛�
- * @since 2024-06-03
+ * @author flq
+ * @since 2024-06-05
*/
public interface ExamTemplateService extends IService<ExamTemplate> {
diff --git a/src/main/java/com/ycl/jxkg/service/impl/ExamTemplateServiceImpl.java b/src/main/java/com/ycl/jxkg/service/impl/ExamTemplateServiceImpl.java
index 5ebc5cb..20bea45 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/ExamTemplateServiceImpl.java
+++ b/src/main/java/com/ycl/jxkg/service/impl/ExamTemplateServiceImpl.java
@@ -1,20 +1,19 @@
package com.ycl.jxkg.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Assert;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.github.pagehelper.PageInfo;
-import com.ycl.jxkg.base.Result;
import com.ycl.jxkg.domain.entity.ExamTemplate;
-import com.ycl.jxkg.domain.form.ExamTemplateForm;
-import com.ycl.jxkg.domain.query.ExamTemplateQuery;
-import com.ycl.jxkg.domain.vo.admin.exam.ExamTemplateVO;
import com.ycl.jxkg.mapper.ExamTemplateMapper;
import com.ycl.jxkg.service.ExamTemplateService;
-import com.ycl.jxkg.utils.PageUtil;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.BeanUtils;
+import com.ycl.jxkg.base.Result;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ycl.jxkg.domain.form.ExamTemplateForm;
+import com.ycl.jxkg.domain.vo.ExamTemplateVO;
+import com.ycl.jxkg.domain.query.ExamTemplateQuery;
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;
@@ -22,8 +21,8 @@
/**
* 闅忔満璇曞嵎妯℃澘 鏈嶅姟瀹炵幇绫�
*
- * @author 寮�鍙戜汉鍛樺悕瀛�
- * @since 2024-06-03
+ * @author flq
+ * @since 2024-06-05
*/
@Service
@RequiredArgsConstructor
@@ -90,10 +89,7 @@
public Result page(ExamTemplateQuery query) {
IPage<ExamTemplateVO> page = PageUtil.getPage(query, ExamTemplateVO.class);
baseMapper.getPage(page, query);
- PageInfo<ExamTemplateVO> pageInfo = new PageInfo<>();
- pageInfo.setList(page.getRecords());
- pageInfo.setTotal(page.getTotal());
- return Result.ok(pageInfo);
+ return Result.ok().data(page.getRecords()).total(page.getTotal());
}
/**
@@ -105,7 +101,7 @@
public Result detail(Integer id) {
ExamTemplateVO vo = baseMapper.getById(id);
Assert.notNull(vo, "璁板綍涓嶅瓨鍦�");
- return Result.ok(vo);
+ return Result.ok().data(vo);
}
/**
@@ -118,6 +114,6 @@
List<ExamTemplateVO> vos = entities.stream()
.map(entity -> ExamTemplateVO.getVoByEntity(entity, null))
.collect(Collectors.toList());
- return Result.ok(vos);
+ return Result.ok().data(vos);
}
}
diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml
index a326f65..88f7bf6 100644
--- a/src/main/resources/logback-spring.xml
+++ b/src/main/resources/logback-spring.xml
@@ -32,7 +32,7 @@
<appender-ref ref="CONSOLE"/>
<appender-ref ref="FILE"/>
</root>
- <logger name="repository" level="DEBUG" additivity="false">
+ <logger name="mapper" level="DEBUG" additivity="false">
<appender-ref ref="CONSOLE"/>
<appender-ref ref="FILE"/>
</logger>
diff --git a/src/main/resources/mapper/ExamTemplateMapper.xml b/src/main/resources/mapper/ExamTemplateMapper.xml
index 2243cd1..a2ca3f5 100644
--- a/src/main/resources/mapper/ExamTemplateMapper.xml
+++ b/src/main/resources/mapper/ExamTemplateMapper.xml
@@ -1,10 +1,15 @@
<?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.monkeylessey.mapper.ExamTemplateMapper">
+<mapper namespace="com.ycl.jxkg.mapper.ExamTemplateMapper">
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.ycl.jxkg.domain.vo.admin.exam.ExamTemplateVO">
- <result column="exam_paper_id" property="examPaperId" />
+ <resultMap id="BaseResultMap" type="com.ycl.jxkg.domain.vo.ExamTemplateVO">
+ <result column="name" property="name" />
+ <result column="subject_id" property="subjectId" />
+ <result column="score" property="score" />
+ <result column="visibility" property="visibility" />
+ <result column="suggest_time" property="suggestTime" />
+ <result column="deduct_type" property="deductType" />
<result column="single_choice" property="singleChoice" />
<result column="multiple_choice" property="multipleChoice" />
<result column="gap_filling" property="gapFilling" />
@@ -16,7 +21,9 @@
<result column="gap_score" property="gapScore" />
<result column="true_false_score" property="trueFalseScore" />
<result column="short_answer_score" property="shortAnswerScore" />
- <result column="calculation_score" property="calculationScore" />
+ <result column="calculation__score" property="calculationScore" />
+ <result column="create_user" property="createUser" />
+ <result column="create_time" property="createTime" />
</resultMap>
@@ -27,7 +34,12 @@
<select id="getById" resultMap="BaseResultMap">
SELECT
- TET.exam_paper_id,
+ TET.name,
+ TET.subject_id,
+ TET.score,
+ TET.visibility,
+ TET.suggest_time,
+ TET.deduct_type,
TET.single_choice,
TET.multiple_choice,
TET.gap_filling,
@@ -40,6 +52,8 @@
TET.true_false_score,
TET.short_answer_score,
TET.calculation__score,
+ TET.create_user,
+ TET.create_time,
TET.id
FROM
t_exam_template TET
@@ -50,7 +64,12 @@
<select id="getPage" resultMap="BaseResultMap">
SELECT
- TET.exam_paper_id,
+ TET.name,
+ TET.subject_id,
+ TET.score,
+ TET.visibility,
+ TET.suggest_time,
+ TET.deduct_type,
TET.single_choice,
TET.multiple_choice,
TET.gap_filling,
@@ -63,11 +82,20 @@
TET.true_false_score,
TET.short_answer_score,
TET.calculation__score,
+ TET.create_user,
+ TET.create_time,
TET.id
FROM
t_exam_template TET
- WHERE
+ <where>
TET.deleted = 0
+ <if test="query.name!=null and query.name !=''">
+ and name like concat ('%',#{query.name},'%')
+ </if>
+ <if test="query.subjectId!=null ">
+ and subject_id = #{query.subjectId}
+ </if>
+ </where>
</select>
</mapper>
--
Gitblit v1.8.0