change 4 лет назад
Родитель
Сommit
30a701ee74
20 измененных файлов с 1016 добавлено и 0 удалено
  1. 112 0
      zhongzheng-admin/src/main/java/com/zhongzheng/controller/exam/ExamKnowledgeController.java
  2. 112 0
      zhongzheng-admin/src/main/java/com/zhongzheng/controller/exam/ExamPaperController.java
  3. 36 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/bo/ExamKnowledgeAddBo.java
  4. 41 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/bo/ExamKnowledgeEditBo.java
  5. 48 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/bo/ExamKnowledgeQueryBo.java
  6. 39 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/bo/ExamPaperAddBo.java
  7. 45 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/bo/ExamPaperEditBo.java
  8. 48 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/bo/ExamPaperQueryBo.java
  9. 41 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/domain/ExamKnowledge.java
  10. 43 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/domain/ExamPaper.java
  11. 14 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/mapper/ExamKnowledgeMapper.java
  12. 14 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/mapper/ExamPaperMapper.java
  13. 52 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/service/IExamKnowledgeService.java
  14. 52 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/service/IExamPaperService.java
  15. 101 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/service/impl/ExamKnowledgeServiceImpl.java
  16. 101 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/service/impl/ExamPaperServiceImpl.java
  17. 39 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/vo/ExamKnowledgeVo.java
  18. 43 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/vo/ExamPaperVo.java
  19. 17 0
      zhongzheng-system/src/main/resources/mapper/modules/exam/ExamKnowledgeMapper.xml
  20. 18 0
      zhongzheng-system/src/main/resources/mapper/modules/exam/ExamPaperMapper.xml

+ 112 - 0
zhongzheng-admin/src/main/java/com/zhongzheng/controller/exam/ExamKnowledgeController.java

@@ -0,0 +1,112 @@
+package com.zhongzheng.controller.exam;
+
+import java.util.List;
+import java.util.Arrays;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zhongzheng.common.annotation.Log;
+import com.zhongzheng.common.core.controller.BaseController;
+import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.enums.BusinessType;
+import com.zhongzheng.modules.exam.vo.ExamKnowledgeVo;
+import com.zhongzheng.modules.exam.bo.ExamKnowledgeQueryBo;
+import com.zhongzheng.modules.exam.bo.ExamKnowledgeAddBo;
+import com.zhongzheng.modules.exam.bo.ExamKnowledgeEditBo;
+import com.zhongzheng.modules.exam.service.IExamKnowledgeService;
+import com.zhongzheng.common.utils.poi.ExcelUtil;
+import com.zhongzheng.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 知识点Controller
+ * 
+ * @author ruoyi
+ * @date 2021-10-18
+ */
+@Api(value = "知识点控制器", tags = {"知识点管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/exam/knowledge")
+public class ExamKnowledgeController extends BaseController {
+
+    private final IExamKnowledgeService iExamKnowledgeService;
+
+    /**
+     * 查询知识点列表
+     */
+    @ApiOperation("查询知识点列表")
+    @PreAuthorize("@ss.hasPermi('exam:knowledge:list')")
+    @GetMapping("/list")
+    public TableDataInfo<ExamKnowledgeVo> list(ExamKnowledgeQueryBo bo) {
+        startPage();
+        List<ExamKnowledgeVo> list = iExamKnowledgeService.queryList(bo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出知识点列表
+     */
+/*    @ApiOperation("导出知识点列表")
+    @PreAuthorize("@ss.hasPermi('exam:knowledge:export')")
+    @Log(title = "知识点", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult<ExamKnowledgeVo> export(ExamKnowledgeQueryBo bo) {
+        List<ExamKnowledgeVo> list = iExamKnowledgeService.queryList(bo);
+        ExcelUtil<ExamKnowledgeVo> util = new ExcelUtil<ExamKnowledgeVo>(ExamKnowledgeVo.class);
+        return util.exportExcel(list, "知识点");
+    }*/
+
+    /**
+     * 获取知识点详细信息
+     */
+    @ApiOperation("获取知识点详细信息")
+    @PreAuthorize("@ss.hasPermi('exam:knowledge:query')")
+    @GetMapping("/{knowledgeId}")
+    public AjaxResult<ExamKnowledgeVo> getInfo(@PathVariable("knowledgeId" ) Long knowledgeId) {
+        return AjaxResult.success(iExamKnowledgeService.queryById(knowledgeId));
+    }
+
+    /**
+     * 新增知识点
+     */
+    @ApiOperation("新增知识点")
+    @PreAuthorize("@ss.hasPermi('exam:knowledge:add')")
+    @Log(title = "知识点", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public AjaxResult<Void> add(@RequestBody ExamKnowledgeAddBo bo) {
+        return toAjax(iExamKnowledgeService.insertByAddBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改知识点
+     */
+    @ApiOperation("修改知识点")
+    @PreAuthorize("@ss.hasPermi('exam:knowledge:edit')")
+    @Log(title = "知识点", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    public AjaxResult<Void> edit(@RequestBody ExamKnowledgeEditBo bo) {
+        return toAjax(iExamKnowledgeService.updateByEditBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 删除知识点
+     */
+/*    @ApiOperation("删除知识点")
+    @PreAuthorize("@ss.hasPermi('exam:knowledge:remove')")
+    @Log(title = "知识点" , businessType = BusinessType.DELETE)
+    @DeleteMapping("/{knowledgeIds}")
+    public AjaxResult<Void> remove(@PathVariable Long[] knowledgeIds) {
+        return toAjax(iExamKnowledgeService.deleteWithValidByIds(Arrays.asList(knowledgeIds), true) ? 1 : 0);
+    }*/
+}

+ 112 - 0
zhongzheng-admin/src/main/java/com/zhongzheng/controller/exam/ExamPaperController.java

@@ -0,0 +1,112 @@
+package com.zhongzheng.controller.exam;
+
+import java.util.List;
+import java.util.Arrays;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zhongzheng.common.annotation.Log;
+import com.zhongzheng.common.core.controller.BaseController;
+import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.enums.BusinessType;
+import com.zhongzheng.modules.exam.vo.ExamPaperVo;
+import com.zhongzheng.modules.exam.bo.ExamPaperQueryBo;
+import com.zhongzheng.modules.exam.bo.ExamPaperAddBo;
+import com.zhongzheng.modules.exam.bo.ExamPaperEditBo;
+import com.zhongzheng.modules.exam.service.IExamPaperService;
+import com.zhongzheng.common.utils.poi.ExcelUtil;
+import com.zhongzheng.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 试卷类型Controller
+ * 
+ * @author ruoyi
+ * @date 2021-10-18
+ */
+@Api(value = "试卷类型控制器", tags = {"试卷类型管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/exam/paper")
+public class ExamPaperController extends BaseController {
+
+    private final IExamPaperService iExamPaperService;
+
+    /**
+     * 查询试卷类型列表
+     */
+    @ApiOperation("查询试卷类型列表")
+    @PreAuthorize("@ss.hasPermi('exam:paper:list')")
+    @GetMapping("/list")
+    public TableDataInfo<ExamPaperVo> list(ExamPaperQueryBo bo) {
+        startPage();
+        List<ExamPaperVo> list = iExamPaperService.queryList(bo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出试卷类型列表
+     */
+ /*   @ApiOperation("导出试卷类型列表")
+    @PreAuthorize("@ss.hasPermi('exam:paper:export')")
+    @Log(title = "试卷类型", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult<ExamPaperVo> export(ExamPaperQueryBo bo) {
+        List<ExamPaperVo> list = iExamPaperService.queryList(bo);
+        ExcelUtil<ExamPaperVo> util = new ExcelUtil<ExamPaperVo>(ExamPaperVo.class);
+        return util.exportExcel(list, "试卷类型");
+    }*/
+
+    /**
+     * 获取试卷类型详细信息
+     */
+    @ApiOperation("获取试卷类型详细信息")
+    @PreAuthorize("@ss.hasPermi('exam:paper:query')")
+    @GetMapping("/{paperId}")
+    public AjaxResult<ExamPaperVo> getInfo(@PathVariable("paperId" ) Long paperId) {
+        return AjaxResult.success(iExamPaperService.queryById(paperId));
+    }
+
+    /**
+     * 新增试卷类型
+     */
+    @ApiOperation("新增试卷类型")
+    @PreAuthorize("@ss.hasPermi('exam:paper:add')")
+    @Log(title = "试卷类型", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public AjaxResult<Void> add(@RequestBody ExamPaperAddBo bo) {
+        return toAjax(iExamPaperService.insertByAddBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改试卷类型
+     */
+    @ApiOperation("修改试卷类型")
+    @PreAuthorize("@ss.hasPermi('exam:paper:edit')")
+    @Log(title = "试卷类型", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    public AjaxResult<Void> edit(@RequestBody ExamPaperEditBo bo) {
+        return toAjax(iExamPaperService.updateByEditBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 删除试卷类型
+     */
+/*    @ApiOperation("删除试卷类型")
+    @PreAuthorize("@ss.hasPermi('exam:paper:remove')")
+    @Log(title = "试卷类型" , businessType = BusinessType.DELETE)
+    @DeleteMapping("/{paperIds}")
+    public AjaxResult<Void> remove(@PathVariable Long[] paperIds) {
+        return toAjax(iExamPaperService.deleteWithValidByIds(Arrays.asList(paperIds), true) ? 1 : 0);
+    }*/
+}

+ 36 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/bo/ExamKnowledgeAddBo.java

@@ -0,0 +1,36 @@
+package com.zhongzheng.modules.exam.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 知识点添加对象 exam_knowledge
+ *
+ * @author ruoyi
+ * @date 2021-10-18
+ */
+@Data
+@ApiModel("知识点添加对象")
+public class ExamKnowledgeAddBo {
+
+    /** 知识点名称 */
+    @ApiModelProperty("知识点名称")
+    private String knowledgeName;
+    /** 0 禁用 1启用 */
+    @ApiModelProperty("0 禁用 1启用")
+    private Integer status;
+    /** 添加时间 */
+    @ApiModelProperty("添加时间")
+    private Long createTime;
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+    /** 编码ZSD */
+    @ApiModelProperty("编码ZSD")
+    private String encoder;
+}

+ 41 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/bo/ExamKnowledgeEditBo.java

@@ -0,0 +1,41 @@
+package com.zhongzheng.modules.exam.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+/**
+ * 知识点编辑对象 exam_knowledge
+ *
+ * @author ruoyi
+ * @date 2021-10-18
+ */
+@Data
+@ApiModel("知识点编辑对象")
+public class ExamKnowledgeEditBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long knowledgeId;
+
+    /** 知识点名称 */
+    @ApiModelProperty("知识点名称")
+    private String knowledgeName;
+
+    /** 0 禁用 1启用 */
+    @ApiModelProperty("0 禁用 1启用")
+    private Integer status;
+
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+
+
+    /** 编码ZSD */
+    @ApiModelProperty("编码ZSD")
+    private String encoder;
+
+}

+ 48 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/bo/ExamKnowledgeQueryBo.java

@@ -0,0 +1,48 @@
+package com.zhongzheng.modules.exam.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.util.Map;
+import java.util.HashMap;
+
+import com.zhongzheng.common.core.domain.BaseEntity;
+
+/**
+ * 知识点分页查询对象 exam_knowledge
+ *
+ * @author ruoyi
+ * @date 2021-10-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("知识点分页查询对象")
+public class ExamKnowledgeQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+	/** 知识点名称 */
+	@ApiModelProperty("知识点名称")
+	private String knowledgeName;
+	/** 0 禁用 1启用 */
+	@ApiModelProperty("0 禁用 1启用")
+	private Integer status;
+	/** 编码ZSD */
+	@ApiModelProperty("编码ZSD")
+	private String encoder;
+}

+ 39 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/bo/ExamPaperAddBo.java

@@ -0,0 +1,39 @@
+package com.zhongzheng.modules.exam.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 试卷类型添加对象 exam_paper
+ *
+ * @author ruoyi
+ * @date 2021-10-18
+ */
+@Data
+@ApiModel("试卷类型添加对象")
+public class ExamPaperAddBo {
+
+    /** 试卷类型名称 */
+    @ApiModelProperty("试卷类型名称")
+    private String paperName;
+    /** 0 禁用 1启用 */
+    @ApiModelProperty("0 禁用 1启用")
+    private Integer status;
+    /** 添加时间 */
+    @ApiModelProperty("添加时间")
+    private Long createTime;
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+    /** 备注 */
+    @ApiModelProperty("备注")
+    private String remark;
+    /** 编码SJ */
+    @ApiModelProperty("编码SJ")
+    private String encoder;
+}

+ 45 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/bo/ExamPaperEditBo.java

@@ -0,0 +1,45 @@
+package com.zhongzheng.modules.exam.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+/**
+ * 试卷类型编辑对象 exam_paper
+ *
+ * @author ruoyi
+ * @date 2021-10-18
+ */
+@Data
+@ApiModel("试卷类型编辑对象")
+public class ExamPaperEditBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long paperId;
+
+    /** 试卷类型名称 */
+    @ApiModelProperty("试卷类型名称")
+    private String paperName;
+
+    /** 0 禁用 1启用 */
+    @ApiModelProperty("0 禁用 1启用")
+    private Integer status;
+
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+
+
+    /** 备注 */
+    @ApiModelProperty("备注")
+    private String remark;
+
+    /** 编码SJ */
+    @ApiModelProperty("编码SJ")
+    private String encoder;
+
+}

+ 48 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/bo/ExamPaperQueryBo.java

@@ -0,0 +1,48 @@
+package com.zhongzheng.modules.exam.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.util.Map;
+import java.util.HashMap;
+
+import com.zhongzheng.common.core.domain.BaseEntity;
+
+/**
+ * 试卷类型分页查询对象 exam_paper
+ *
+ * @author ruoyi
+ * @date 2021-10-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("试卷类型分页查询对象")
+public class ExamPaperQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+	/** 试卷类型名称 */
+	@ApiModelProperty("试卷类型名称")
+	private String paperName;
+	/** 0 禁用 1启用 */
+	@ApiModelProperty("0 禁用 1启用")
+	private Integer status;
+	/** 编码SJ */
+	@ApiModelProperty("编码SJ")
+	private String encoder;
+}

+ 41 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/domain/ExamKnowledge.java

@@ -0,0 +1,41 @@
+package com.zhongzheng.modules.exam.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.zhongzheng.common.annotation.Excel;
+
+/**
+ * 知识点对象 exam_knowledge
+ *
+ * @author ruoyi
+ * @date 2021-10-18
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("exam_knowledge")
+public class ExamKnowledge implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** $column.columnComment */
+    @TableId(value = "knowledge_id")
+    private Long knowledgeId;
+    /** 知识点名称 */
+    private String knowledgeName;
+    /** 0 禁用 1启用 */
+    private Integer status;
+    /** 添加时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** 修改时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+    /** 编码ZSD */
+    private String encoder;
+}

+ 43 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/domain/ExamPaper.java

@@ -0,0 +1,43 @@
+package com.zhongzheng.modules.exam.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.zhongzheng.common.annotation.Excel;
+
+/**
+ * 试卷类型对象 exam_paper
+ *
+ * @author ruoyi
+ * @date 2021-10-18
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("exam_paper")
+public class ExamPaper implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** $column.columnComment */
+    @TableId(value = "paper_id")
+    private Long paperId;
+    /** 试卷类型名称 */
+    private String paperName;
+    /** 0 禁用 1启用 */
+    private Integer status;
+    /** 添加时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** 修改时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+    /** 备注 */
+    private String remark;
+    /** 编码SJ */
+    private String encoder;
+}

+ 14 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/mapper/ExamKnowledgeMapper.java

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.exam.mapper;
+
+import com.zhongzheng.modules.exam.domain.ExamKnowledge;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 知识点Mapper接口
+ *
+ * @author ruoyi
+ * @date 2021-10-18
+ */
+public interface ExamKnowledgeMapper extends BaseMapper<ExamKnowledge> {
+
+}

+ 14 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/mapper/ExamPaperMapper.java

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.exam.mapper;
+
+import com.zhongzheng.modules.exam.domain.ExamPaper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 试卷类型Mapper接口
+ *
+ * @author ruoyi
+ * @date 2021-10-18
+ */
+public interface ExamPaperMapper extends BaseMapper<ExamPaper> {
+
+}

+ 52 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/service/IExamKnowledgeService.java

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.exam.service;
+
+import com.zhongzheng.modules.exam.domain.ExamKnowledge;
+import com.zhongzheng.modules.exam.vo.ExamKnowledgeVo;
+import com.zhongzheng.modules.exam.bo.ExamKnowledgeQueryBo;
+import com.zhongzheng.modules.exam.bo.ExamKnowledgeAddBo;
+import com.zhongzheng.modules.exam.bo.ExamKnowledgeEditBo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 知识点Service接口
+ *
+ * @author ruoyi
+ * @date 2021-10-18
+ */
+public interface IExamKnowledgeService extends IService<ExamKnowledge> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	ExamKnowledgeVo queryById(Long knowledgeId);
+
+	/**
+	 * 查询列表
+	 */
+	List<ExamKnowledgeVo> queryList(ExamKnowledgeQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入知识点
+	 * @param bo 知识点新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(ExamKnowledgeAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改知识点
+	 * @param bo 知识点编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(ExamKnowledgeEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

+ 52 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/service/IExamPaperService.java

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.exam.service;
+
+import com.zhongzheng.modules.exam.domain.ExamPaper;
+import com.zhongzheng.modules.exam.vo.ExamPaperVo;
+import com.zhongzheng.modules.exam.bo.ExamPaperQueryBo;
+import com.zhongzheng.modules.exam.bo.ExamPaperAddBo;
+import com.zhongzheng.modules.exam.bo.ExamPaperEditBo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 试卷类型Service接口
+ *
+ * @author ruoyi
+ * @date 2021-10-18
+ */
+public interface IExamPaperService extends IService<ExamPaper> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	ExamPaperVo queryById(Long paperId);
+
+	/**
+	 * 查询列表
+	 */
+	List<ExamPaperVo> queryList(ExamPaperQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入试卷类型
+	 * @param bo 试卷类型新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(ExamPaperAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改试卷类型
+	 * @param bo 试卷类型编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(ExamPaperEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

+ 101 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/service/impl/ExamKnowledgeServiceImpl.java

@@ -0,0 +1,101 @@
+package com.zhongzheng.modules.exam.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.common.utils.DateUtils;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.Page;
+import com.zhongzheng.modules.exam.bo.ExamKnowledgeAddBo;
+import com.zhongzheng.modules.exam.bo.ExamKnowledgeQueryBo;
+import com.zhongzheng.modules.exam.bo.ExamKnowledgeEditBo;
+import com.zhongzheng.modules.exam.domain.ExamKnowledge;
+import com.zhongzheng.modules.exam.mapper.ExamKnowledgeMapper;
+import com.zhongzheng.modules.exam.vo.ExamKnowledgeVo;
+import com.zhongzheng.modules.exam.service.IExamKnowledgeService;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 知识点Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2021-10-18
+ */
+@Service
+public class ExamKnowledgeServiceImpl extends ServiceImpl<ExamKnowledgeMapper, ExamKnowledge> implements IExamKnowledgeService {
+
+    @Override
+    public ExamKnowledgeVo queryById(Long knowledgeId){
+        ExamKnowledge db = this.baseMapper.selectById(knowledgeId);
+        return BeanUtil.toBean(db, ExamKnowledgeVo.class);
+    }
+
+    @Override
+    public List<ExamKnowledgeVo> queryList(ExamKnowledgeQueryBo bo) {
+        LambdaQueryWrapper<ExamKnowledge> lqw = Wrappers.lambdaQuery();
+        lqw.like(StrUtil.isNotBlank(bo.getKnowledgeName()), ExamKnowledge::getKnowledgeName, bo.getKnowledgeName());
+        lqw.eq(bo.getStatus() != null, ExamKnowledge::getStatus, bo.getStatus());
+        lqw.eq(StrUtil.isNotBlank(bo.getEncoder()), ExamKnowledge::getEncoder, bo.getEncoder());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<ExamKnowledgeVo> entity2Vo(Collection<ExamKnowledge> collection) {
+        List<ExamKnowledgeVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, ExamKnowledgeVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<ExamKnowledge> page = (Page<ExamKnowledge>)collection;
+            Page<ExamKnowledgeVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(ExamKnowledgeAddBo bo) {
+        ExamKnowledge add = BeanUtil.toBean(bo, ExamKnowledge.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(ExamKnowledgeEditBo bo) {
+        ExamKnowledge update = BeanUtil.toBean(bo, ExamKnowledge.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(ExamKnowledge entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+}

+ 101 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/service/impl/ExamPaperServiceImpl.java

@@ -0,0 +1,101 @@
+package com.zhongzheng.modules.exam.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.common.utils.DateUtils;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.Page;
+import com.zhongzheng.modules.exam.bo.ExamPaperAddBo;
+import com.zhongzheng.modules.exam.bo.ExamPaperQueryBo;
+import com.zhongzheng.modules.exam.bo.ExamPaperEditBo;
+import com.zhongzheng.modules.exam.domain.ExamPaper;
+import com.zhongzheng.modules.exam.mapper.ExamPaperMapper;
+import com.zhongzheng.modules.exam.vo.ExamPaperVo;
+import com.zhongzheng.modules.exam.service.IExamPaperService;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 试卷类型Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2021-10-18
+ */
+@Service
+public class ExamPaperServiceImpl extends ServiceImpl<ExamPaperMapper, ExamPaper> implements IExamPaperService {
+
+    @Override
+    public ExamPaperVo queryById(Long paperId){
+        ExamPaper db = this.baseMapper.selectById(paperId);
+        return BeanUtil.toBean(db, ExamPaperVo.class);
+    }
+
+    @Override
+    public List<ExamPaperVo> queryList(ExamPaperQueryBo bo) {
+        LambdaQueryWrapper<ExamPaper> lqw = Wrappers.lambdaQuery();
+        lqw.like(StrUtil.isNotBlank(bo.getPaperName()), ExamPaper::getPaperName, bo.getPaperName());
+        lqw.eq(bo.getStatus() != null, ExamPaper::getStatus, bo.getStatus());
+        lqw.eq(StrUtil.isNotBlank(bo.getEncoder()), ExamPaper::getEncoder, bo.getEncoder());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<ExamPaperVo> entity2Vo(Collection<ExamPaper> collection) {
+        List<ExamPaperVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, ExamPaperVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<ExamPaper> page = (Page<ExamPaper>)collection;
+            Page<ExamPaperVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(ExamPaperAddBo bo) {
+        ExamPaper add = BeanUtil.toBean(bo, ExamPaper.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(ExamPaperEditBo bo) {
+        ExamPaper update = BeanUtil.toBean(bo, ExamPaper.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(ExamPaper entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+}

+ 39 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/vo/ExamKnowledgeVo.java

@@ -0,0 +1,39 @@
+package com.zhongzheng.modules.exam.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 知识点视图对象 mall_package
+ *
+ * @author ruoyi
+ * @date 2021-10-18
+ */
+@Data
+@ApiModel("知识点视图对象")
+public class ExamKnowledgeVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long knowledgeId;
+
+	/** 知识点名称 */
+	@Excel(name = "知识点名称")
+	@ApiModelProperty("知识点名称")
+	private String knowledgeName;
+	/** 0 禁用 1启用 */
+	@Excel(name = "0 禁用 1启用")
+	@ApiModelProperty("0 禁用 1启用")
+	private Integer status;
+	/** 编码ZSD */
+	@Excel(name = "编码ZSD")
+	@ApiModelProperty("编码ZSD")
+	private String encoder;
+}

+ 43 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/vo/ExamPaperVo.java

@@ -0,0 +1,43 @@
+package com.zhongzheng.modules.exam.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 试卷类型视图对象 mall_package
+ *
+ * @author ruoyi
+ * @date 2021-10-18
+ */
+@Data
+@ApiModel("试卷类型视图对象")
+public class ExamPaperVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long paperId;
+
+	/** 试卷类型名称 */
+	@Excel(name = "试卷类型名称")
+	@ApiModelProperty("试卷类型名称")
+	private String paperName;
+	/** 0 禁用 1启用 */
+	@Excel(name = "0 禁用 1启用")
+	@ApiModelProperty("0 禁用 1启用")
+	private Integer status;
+	/** 备注 */
+	@Excel(name = "备注")
+	@ApiModelProperty("备注")
+	private String remark;
+	/** 编码SJ */
+	@Excel(name = "编码SJ")
+	@ApiModelProperty("编码SJ")
+	private String encoder;
+}

+ 17 - 0
zhongzheng-system/src/main/resources/mapper/modules/exam/ExamKnowledgeMapper.xml

@@ -0,0 +1,17 @@
+<?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.zhongzheng.modules.exam.mapper.ExamKnowledgeMapper">
+
+    <resultMap type="com.zhongzheng.modules.exam.domain.ExamKnowledge" id="ExamKnowledgeResult">
+        <result property="knowledgeId" column="knowledge_id"/>
+        <result property="knowledgeName" column="knowledge_name"/>
+        <result property="status" column="status"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="encoder" column="encoder"/>
+    </resultMap>
+
+
+</mapper>

+ 18 - 0
zhongzheng-system/src/main/resources/mapper/modules/exam/ExamPaperMapper.xml

@@ -0,0 +1,18 @@
+<?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.zhongzheng.modules.exam.mapper.ExamPaperMapper">
+
+    <resultMap type="com.zhongzheng.modules.exam.domain.ExamPaper" id="ExamPaperResult">
+        <result property="paperId" column="paper_id"/>
+        <result property="paperName" column="paper_name"/>
+        <result property="status" column="status"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="remark" column="remark"/>
+        <result property="encoder" column="encoder"/>
+    </resultMap>
+
+
+</mapper>