add 考试重点 考试配置

zhongzheng-admin/src/main/java/com/zhongzheng/controller/bank/ExamConfigController.java

@@ -0,0 +1,116 @@
+package com.zhongzheng.controller.bank;
+
+import java.util.List;
+import java.util.Arrays;
+
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.zhongzheng.modules.bank.bo.ExamConfigAddBo;
+import com.zhongzheng.modules.bank.bo.ExamConfigEditBo;
+import com.zhongzheng.modules.bank.bo.ExamConfigQueryBo;
+import com.zhongzheng.modules.bank.service.IExamConfigService;
+import com.zhongzheng.modules.bank.vo.ExamConfigVo;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+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.common.utils.poi.ExcelUtil;
+import com.zhongzheng.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 考题配置Controller
+ *
+ * @author hjl
+ * @date 2021-05-21
+ */
+@Api(value = "考题配置控制器", tags = {"考题配置管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/exam/config")
+public class ExamConfigController extends BaseController {
+
+    private final IExamConfigService iExamConfigService;
+
+    /**
+     * 查询考题配置列表
+     */
+    @ApiOperation("查询考题配置列表")
+    @PreAuthorize("@ss.hasPermi('exam:config:list')")
+    @GetMapping("/list")
+    public TableDataInfo<ExamConfigVo> list(ExamConfigQueryBo bo) {
+        startPage();
+        List<ExamConfigVo> list = iExamConfigService.queryList(bo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出考题配置列表
+     */
+    /*@ApiOperation("导出考题配置列表")
+    @PreAuthorize("@ss.hasPermi('exam:config:export')")
+    @Log(title = "考题配置", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult<ExamConfigVo> export(ExamConfigQueryBo bo) {
+        List<ExamConfigVo> list = iExamConfigService.queryList(bo);
+        ExcelUtil<ExamConfigVo> util = new ExcelUtil<ExamConfigVo>(ExamConfigVo.class);
+        return util.exportExcel(list, "考题配置");
+    }*/
+
+    /**
+     * 获取考题配置详细信息
+     */
+    @ApiOperation("获取考题配置详细信息")
+    @PreAuthorize("@ss.hasPermi('exam:config:query')")
+    @GetMapping("/{id}")
+    public AjaxResult<ExamConfigVo> getInfo(@PathVariable("id" ) Long id) {
+        return AjaxResult.success(iExamConfigService.queryById(id));
+    }
+
+    /**
+     * 新增考题配置
+     */
+    @ApiOperation("新增考题配置")
+    @ApiOperationSupport(ignoreParameters = {"updateTime","createTime"})
+    @PreAuthorize("@ss.hasPermi('exam:config:add')")
+    @Log(title = "考题配置", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public AjaxResult<Void> add(@Validated @RequestBody ExamConfigAddBo bo) {
+        return toAjax(iExamConfigService.insertByAddBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改考题配置
+     */
+    @ApiOperation("修改考题配置")
+    @ApiOperationSupport(ignoreParameters = {"updateTime","createTime"})
+    @PreAuthorize("@ss.hasPermi('exam:config:edit')")
+    @Log(title = "考题配置", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    public AjaxResult<Void> edit(@Validated  @RequestBody ExamConfigEditBo bo) {
+        return toAjax(iExamConfigService.updateByEditBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 删除考题配置
+     */
+    @ApiOperation("删除考题配置")
+    @PreAuthorize("@ss.hasPermi('exam:config:remove')")
+    @Log(title = "考题配置" , businessType = BusinessType.DELETE)
+    @PostMapping("/delete")
+    public AjaxResult<Void> remove(@RequestBody Long[] ids) {
+        return toAjax(iExamConfigService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
+    }
+}

zhongzheng-admin/src/main/java/com/zhongzheng/controller/bank/ExamNoteController.java

@@ -0,0 +1,113 @@
+package com.zhongzheng.controller.bank;
+
+import java.util.List;
+import java.util.Arrays;
+
+import com.zhongzheng.modules.bank.bo.ExamNoteAddBo;
+import com.zhongzheng.modules.bank.bo.ExamNoteEditBo;
+import com.zhongzheng.modules.bank.bo.ExamNoteQueryBo;
+import com.zhongzheng.modules.bank.service.IExamNoteService;
+import com.zhongzheng.modules.bank.vo.ExamNoteVo;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+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.common.utils.poi.ExcelUtil;
+import com.zhongzheng.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 考试重点Controller
+ *
+ * @author hjl
+ * @date 2021-05-21
+ */
+@Api(value = "考试重点控制器", tags = {"考试重点管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/exam/note")
+public class ExamNoteController extends BaseController {
+
+    private final IExamNoteService iExamNoteService;
+
+    /**
+     * 查询考试重点列表
+     */
+    @ApiOperation("查询考试重点列表")
+    @PreAuthorize("@ss.hasPermi('exam:note:list')")
+    @GetMapping("/list")
+    public TableDataInfo<ExamNoteVo> list(ExamNoteQueryBo bo) {
+        startPage();
+        List<ExamNoteVo> list = iExamNoteService.queryList(bo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出考试重点列表
+     */
+    /*@ApiOperation("导出考试重点列表")
+    @PreAuthorize("@ss.hasPermi('exam:note:export')")
+    @Log(title = "考试重点", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult<ExamNoteVo> export(ExamNoteQueryBo bo) {
+        List<ExamNoteVo> list = iExamNoteService.queryList(bo);
+        ExcelUtil<ExamNoteVo> util = new ExcelUtil<ExamNoteVo>(ExamNoteVo.class);
+        return util.exportExcel(list, "考试重点");
+    }*/
+
+    /**
+     * 获取考试重点详细信息
+     */
+    @ApiOperation("获取考试重点详细信息")
+    @PreAuthorize("@ss.hasPermi('exam:note:query')")
+    @GetMapping("/{fileId}")
+    public AjaxResult<ExamNoteVo> getInfo(@PathVariable("fileId" ) Long fileId) {
+        return AjaxResult.success(iExamNoteService.queryById(fileId));
+    }
+
+    /**
+     * 新增考试重点
+     */
+    @ApiOperation("新增考试重点")
+    @PreAuthorize("@ss.hasPermi('exam:note:add')")
+    @Log(title = "考试重点", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public AjaxResult<Void> add(@Validated @RequestBody ExamNoteAddBo bo) {
+        return toAjax(iExamNoteService.insertByAddBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改考试重点
+     */
+    @ApiOperation("修改考试重点")
+    @PreAuthorize("@ss.hasPermi('exam:note:edit')")
+    @Log(title = "考试重点", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    public AjaxResult<Void> edit(@Validated @RequestBody ExamNoteEditBo bo) {
+        return toAjax(iExamNoteService.updateByEditBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 删除考试重点
+     */
+    @ApiOperation("删除考试重点")
+    @PreAuthorize("@ss.hasPermi('exam:note:remove')")
+    @Log(title = "考试重点" , businessType = BusinessType.DELETE)
+    @PostMapping("/delete")
+    public AjaxResult<Void> remove(@RequestBody Long[] fileIds) {
+        return toAjax(iExamNoteService.deleteWithValidByIds(Arrays.asList(fileIds), true) ? 1 : 0);
+    }
+}

zhongzheng-admin/src/main/java/com/zhongzheng/controller/file/PdfFileController.java

@@ -1,115 +0,0 @@
-package com.zhongzheng.controller.file;
-
-import java.util.List;
-import java.util.Arrays;
-
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import com.zhongzheng.modules.file.bo.PdfFileAddBo;
-import com.zhongzheng.modules.file.bo.PdfFileEditBo;
-import com.zhongzheng.modules.file.bo.PdfFileQueryBo;
-import com.zhongzheng.modules.file.service.IPdfFileService;
-import com.zhongzheng.modules.file.vo.PdfFileVo;
-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.common.utils.poi.ExcelUtil;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-/**
- * pdf 文件Controller
- *
- * @author hjl
- * @date 2021-05-19
- */
-@Api(value = "pdf 文件控制器", tags = {"pdf 文件管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/file/pdf")
-public class PdfFileController extends BaseController {
-
-    private final IPdfFileService iPdfFileService;
-
-    /**
-     * 查询pdf 文件列表
-     */
-    @ApiOperation("查询pdf 文件列表")
-    @PreAuthorize("@ss.hasPermi('file:pdf:list')")
-    @GetMapping("/list")
-    public TableDataInfo<PdfFileVo> list(PdfFileQueryBo bo) {
-        startPage();
-        List<PdfFileVo> list = iPdfFileService.queryList(bo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出pdf 文件列表
-     */
-   /* @ApiOperation("导出pdf 文件列表")
-    @PreAuthorize("@ss.hasPermi('file:pdf:export')")
-    @Log(title = "pdf 文件", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult<PdfFileVo> export(PdfFileQueryBo bo) {
-        List<PdfFileVo> list = iPdfFileService.queryList(bo);
-        ExcelUtil<PdfFileVo> util = new ExcelUtil<PdfFileVo>(PdfFileVo.class);
-        return util.exportExcel(list, "pdf 文件");
-    }*/
-
-    /**
-     * 获取pdf 文件详细信息
-     */
-    @ApiOperation("获取pdf 文件详细信息")
-    @PreAuthorize("@ss.hasPermi('file:pdf:query')")
-    @GetMapping("/{fileId}")
-    public AjaxResult<PdfFileVo> getInfo(@PathVariable("fileId" ) Long fileId) {
-        return AjaxResult.success(iPdfFileService.queryById(fileId));
-    }
-
-    /**
-     * 新增pdf 文件
-     */
-    @ApiOperation("新增pdf 文件")
-    @ApiOperationSupport(ignoreParameters = {"updateTime","createTime"})
-    @PreAuthorize("@ss.hasPermi('file:pdf:add')")
-    @Log(title = "pdf 文件", businessType = BusinessType.INSERT)
-    @PostMapping()
-    public AjaxResult<Void> add(@RequestBody PdfFileAddBo bo) {
-        return toAjax(iPdfFileService.insertByAddBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 修改pdf 文件
-     */
-    @ApiOperation("修改pdf 文件")
-    @ApiOperationSupport(ignoreParameters = {"updateTime","createTime"})
-    @PreAuthorize("@ss.hasPermi('file:pdf:edit')")
-    @Log(title = "pdf 文件", businessType = BusinessType.UPDATE)
-    @PostMapping("/edit")
-    public AjaxResult<Void> edit(@RequestBody PdfFileEditBo bo) {
-        return toAjax(iPdfFileService.updateByEditBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 删除pdf 文件
-     */
-    @ApiOperation("删除pdf 文件")
-    @PreAuthorize("@ss.hasPermi('file:pdf:remove')")
-    @Log(title = "pdf 文件" , businessType = BusinessType.DELETE)
-    @PostMapping("/delete")
-    public AjaxResult<Void> remove(@RequestBody Long[] fileIds) {
-        return toAjax(iPdfFileService.deleteWithValidByIds(Arrays.asList(fileIds), true) ? 1 : 0);
-    }
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/bo/ExamConfigAddBo.java

@@ -0,0 +1,70 @@
+package com.zhongzheng.modules.bank.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import javax.validation.constraints.Min;
+import java.util.Date;
+
+
+import java.math.BigDecimal;
+
+/**
+ * 考题配置添加对象 exam_config
+ *
+ * @author hjl
+ * @date 2021-05-21
+ */
+@Data
+@ApiModel("考题配置添加对象")
+public class ExamConfigAddBo {
+
+    /** 合格分数 */
+    @ApiModelProperty("合格分数")
+    private BigDecimal passingScore;
+    /** 考试时间 单位（秒） */
+    @ApiModelProperty("考试时间 单位（秒）")
+    private Long examTime;
+    /** 单选题数量 */
+    @ApiModelProperty("单选题数量")
+    private Long singleChoiceNum;
+    /** 单选题分值 */
+    @ApiModelProperty("单选题分值")
+    private BigDecimal singleChoiceScore;
+    /** 多选题数量 */
+    @ApiModelProperty("多选题数量")
+    private Long multipleChoiceNum;
+    /** 多选题分值 */
+    @ApiModelProperty("多选题分值")
+    private BigDecimal multipleChoiceScore;
+    /** 判断题数量 */
+    @ApiModelProperty("判断题数量")
+    private Long judgmentNum;
+    /** 判断题分值 */
+    @ApiModelProperty("判断题分值")
+    private BigDecimal judgmentScore;
+    /** 案例数量 */
+    @ApiModelProperty("案例数量")
+    private Long caseNum;
+    /** 案例分值 */
+    @ApiModelProperty("案例分值")
+    private BigDecimal caseScore;
+    /** 总分 */
+    @ApiModelProperty("总分")
+    private BigDecimal totalScore;
+    /** 添加时间 */
+    @ApiModelProperty("添加时间")
+    private Long createTime;
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+    /** 状态 1正常 0关闭 */
+    @ApiModelProperty("状态 1正常 0关闭")
+    private Integer status;
+    /** 类目ID */
+    @ApiModelProperty("类目ID")
+    @Min(value = 1, message = "类目ID错误")
+    private Long categoryId;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/bo/ExamConfigEditBo.java

@@ -0,0 +1,84 @@
+package com.zhongzheng.modules.bank.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import javax.validation.constraints.Min;
+import java.util.Date;
+
+import java.math.BigDecimal;
+
+/**
+ * 考题配置编辑对象 exam_config
+ *
+ * @author hjl
+ * @date 2021-05-21
+ */
+@Data
+@ApiModel("考题配置编辑对象")
+public class ExamConfigEditBo {
+
+
+    /** 考试配置ID */
+    @ApiModelProperty("考试配置ID")
+    private Long id;
+
+    /** 合格分数 */
+    @ApiModelProperty("合格分数")
+    private BigDecimal passingScore;
+
+    /** 考试时间 单位（秒） */
+    @ApiModelProperty("考试时间 单位（秒）")
+    private Long examTime;
+
+    /** 单选题数量 */
+    @ApiModelProperty("单选题数量")
+    private Long singleChoiceNum;
+
+    /** 单选题分值 */
+    @ApiModelProperty("单选题分值")
+    private BigDecimal singleChoiceScore;
+
+    /** 多选题数量 */
+    @ApiModelProperty("多选题数量")
+    private Long multipleChoiceNum;
+
+    /** 多选题分值 */
+    @ApiModelProperty("多选题分值")
+    private BigDecimal multipleChoiceScore;
+
+    /** 判断题数量 */
+    @ApiModelProperty("判断题数量")
+    private Long judgmentNum;
+
+    /** 判断题分值 */
+    @ApiModelProperty("判断题分值")
+    private BigDecimal judgmentScore;
+
+    /** 案例数量 */
+    @ApiModelProperty("案例数量")
+    private Long caseNum;
+
+    /** 案例分值 */
+    @ApiModelProperty("案例分值")
+    private BigDecimal caseScore;
+
+    /** 总分 */
+    @ApiModelProperty("总分")
+    private BigDecimal totalScore;
+
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+
+    /** 状态 1正常 0关闭 */
+    @ApiModelProperty("状态 1正常 0关闭")
+    private Integer status;
+
+    /** 类目ID */
+    @ApiModelProperty("类目ID")
+    @Min(value = 1, message = "类目ID错误")
+    private Long categoryId;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/bo/ExamConfigQueryBo.java

@@ -0,0 +1,80 @@
+package com.zhongzheng.modules.bank.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 java.math.BigDecimal;
+import com.zhongzheng.common.core.domain.BaseEntity;
+
+/**
+ * 考题配置分页查询对象 exam_config
+ *
+ * @author hjl
+ * @date 2021-05-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("考题配置分页查询对象")
+public class ExamConfigQueryBo 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 BigDecimal passingScore;
+	/** 考试时间 单位（秒） */
+	@ApiModelProperty("考试时间 单位（秒）")
+	private Long examTime;
+	/** 单选题数量 */
+	@ApiModelProperty("单选题数量")
+	private Long singleChoiceNum;
+	/** 单选题分值 */
+	@ApiModelProperty("单选题分值")
+	private BigDecimal singleChoiceScore;
+	/** 多选题数量 */
+	@ApiModelProperty("多选题数量")
+	private Long multipleChoiceNum;
+	/** 多选题分值 */
+	@ApiModelProperty("多选题分值")
+	private BigDecimal multipleChoiceScore;
+	/** 判断题数量 */
+	@ApiModelProperty("判断题数量")
+	private Long judgmentNum;
+	/** 判断题分值 */
+	@ApiModelProperty("判断题分值")
+	private BigDecimal judgmentScore;
+	/** 案例数量 */
+	@ApiModelProperty("案例数量")
+	private Long caseNum;
+	/** 案例分值 */
+	@ApiModelProperty("案例分值")
+	private BigDecimal caseScore;
+	/** 总分 */
+	@ApiModelProperty("总分")
+	private BigDecimal totalScore;
+	/** 状态 1正常 0关闭 */
+	@ApiModelProperty("状态 1正常 0关闭")
+	private Integer status;
+	/** 类目ID */
+	@ApiModelProperty("类目ID")
+	private Long categoryId;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/file/bo/PdfFileAddBo.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/bo/ExamNoteAddBo.java

@@ -1,10 +1,11 @@
-package com.zhongzheng.modules.file.bo;
+package com.zhongzheng.modules.bank.bo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
+import javax.validation.constraints.Min;
 import javax.validation.constraints.NotBlank;
 import java.util.Date;
 
@@ -12,34 +13,29 @@ import java.util.Date;
 import java.math.BigDecimal;
 
 /**
- * pdf 文件添加对象 pdf_file
+ * 考试重点添加对象 exam_note
  *
  * @author hjl
- * @date 2021-05-19
+ * @date 2021-05-21
  */
 @Data
-@ApiModel("pdf 文件添加对象")
-public class PdfFileAddBo {
+@ApiModel("考试重点添加对象")
+public class ExamNoteAddBo {
 
     /** 分类ID */
     @ApiModelProperty("分类ID")
+    @Min(value = 1, message = "类目ID错误")
     private Long categoryId;
-    /** 文件名 */
-    @ApiModelProperty("文件名")
-    @NotBlank(message = "文件名不能为空")
-    private String fileName;
+    /** 名称 */
+    @ApiModelProperty("名称")
+    @NotBlank(message = "名称不能为空")
+    private String name;
     /** 教师ID拼接，用,拼接 */
     @ApiModelProperty("教师ID拼接，用,拼接")
     private String teacherIds;
     /** 价格 */
     @ApiModelProperty("价格")
     private BigDecimal price;
-    /** 开始时间 */
-    @ApiModelProperty("开始时间")
-    private Long startTime;
-    /** 结束时间 */
-    @ApiModelProperty("结束时间")
-    private Long endTime;
     /** 封面地址 */
     @ApiModelProperty("封面地址")
     private String coverUrl;
@@ -55,8 +51,10 @@ public class PdfFileAddBo {
     /** 状态 1正常 0关闭 */
     @ApiModelProperty("状态 1正常 0关闭")
     private Integer status;
-    /** 文件url */
-    @ApiModelProperty("文件url")
-    @NotBlank(message = "文件url不能为空")
-    private String fileUrl;
+    /** 文件url，用,拼接 */
+    @ApiModelProperty("文件url，用,拼接")
+    private String fileUrls;
+    /** 排序 */
+    @ApiModelProperty("排序")
+    private Long sort;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/file/bo/PdfFileEditBo.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/bo/ExamNoteEditBo.java

@@ -1,22 +1,25 @@
-package com.zhongzheng.modules.file.bo;
+package com.zhongzheng.modules.bank.bo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
 import java.util.Date;
 
 import java.math.BigDecimal;
 
 /**
- * pdf 文件编辑对象 pdf_file
+ * 考试重点编辑对象 exam_note
  *
  * @author hjl
- * @date 2021-05-19
+ * @date 2021-05-21
  */
 @Data
-@ApiModel("pdf 文件编辑对象")
-public class PdfFileEditBo {
+@ApiModel("考试重点编辑对象")
+public class ExamNoteEditBo {
 
 
     /** $column.columnComment */
@@ -25,11 +28,13 @@ public class PdfFileEditBo {
 
     /** 分类ID */
     @ApiModelProperty("分类ID")
+    @Min(value = 1, message = "类目ID错误")
     private Long categoryId;
 
-    /** 文件名 */
-    @ApiModelProperty("文件名")
-    private String fileName;
+    /** 名称 */
+    @ApiModelProperty("名称")
+    @NotBlank(message = "名称不能为空")
+    private String name;
 
     /** 教师ID拼接，用,拼接 */
     @ApiModelProperty("教师ID拼接，用,拼接")
@@ -39,14 +44,6 @@ public class PdfFileEditBo {
     @ApiModelProperty("价格")
     private BigDecimal price;
 
-    /** 开始时间 */
-    @ApiModelProperty("开始时间")
-    private Long startTime;
-
-    /** 结束时间 */
-    @ApiModelProperty("结束时间")
-    private Long endTime;
-
     /** 封面地址 */
     @ApiModelProperty("封面地址")
     private String coverUrl;
@@ -63,7 +60,11 @@ public class PdfFileEditBo {
     @ApiModelProperty("状态 1正常 0关闭")
     private Integer status;
 
-    /** 文件url */
-    @ApiModelProperty("文件url")
-    private String fileUrl;
+    /** 文件url，用,拼接 */
+    @ApiModelProperty("文件url，用,拼接")
+    private String fileUrls;
+
+    /** 排序 */
+    @ApiModelProperty("排序")
+    private Long sort;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/file/bo/PdfFileQueryBo.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/bo/ExamNoteQueryBo.java

@@ -1,4 +1,4 @@
-package com.zhongzheng.modules.file.bo;
+package com.zhongzheng.modules.bank.bo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -13,15 +13,15 @@ import java.math.BigDecimal;
 import com.zhongzheng.common.core.domain.BaseEntity;
 
 /**
- * pdf 文件分页查询对象 pdf_file
+ * 考试重点分页查询对象 exam_note
  *
  * @author hjl
- * @date 2021-05-19
+ * @date 2021-05-21
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel("pdf 文件分页查询对象")
-public class PdfFileQueryBo extends BaseEntity {
+@ApiModel("考试重点分页查询对象")
+public class ExamNoteQueryBo extends BaseEntity {
 
 	/** 分页大小 */
 	@ApiModelProperty("分页大小")
@@ -40,21 +40,15 @@ public class PdfFileQueryBo extends BaseEntity {
 	/** 分类ID */
 	@ApiModelProperty("分类ID")
 	private Long categoryId;
-	/** 文件名 */
-	@ApiModelProperty("文件名")
-	private String fileName;
+	/** 名称 */
+	@ApiModelProperty("名称")
+	private String name;
 	/** 教师ID拼接，用,拼接 */
 	@ApiModelProperty("教师ID拼接，用,拼接")
 	private String teacherIds;
 	/** 价格 */
 	@ApiModelProperty("价格")
 	private BigDecimal price;
-	/** 开始时间 */
-	@ApiModelProperty("开始时间")
-	private Long startTime;
-	/** 结束时间 */
-	@ApiModelProperty("结束时间")
-	private Long endTime;
 	/** 封面地址 */
 	@ApiModelProperty("封面地址")
 	private String coverUrl;
@@ -64,8 +58,11 @@ public class PdfFileQueryBo extends BaseEntity {
 	/** 状态 1正常 0关闭 */
 	@ApiModelProperty("状态 1正常 0关闭")
 	private Integer status;
-	/** 文件url */
-	@ApiModelProperty("文件url")
-	private String fileUrl;
+	/** 文件url，用,拼接 */
+	@ApiModelProperty("文件url，用,拼接")
+	private String fileUrls;
+	/** 排序 */
+	@ApiModelProperty("排序")
+	private Long sort;
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/bo/QuestionBankAddBo.java

@@ -5,7 +5,6 @@ import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
-import javax.validation.constraints.DecimalMin;
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotBlank;
 import java.util.Date;
@@ -17,7 +16,7 @@ import java.math.BigDecimal;
  * 题库添加对象 question_bank
  *
  * @author hjl
- * @date 2021-05-20
+ * @date 2021-05-21
  */
 @Data
 @ApiModel("题库添加对象")
@@ -25,7 +24,7 @@ public class QuestionBankAddBo {
 
     /** 类目ID */
     @ApiModelProperty("类目ID")
-    @Min(value = 0, message = "分类ID不能为空")
+    @Min(value = 1, message = "类目ID错误")
     private Long categoryId;
     /** 题库名称 */
     @ApiModelProperty("题库名称")
@@ -33,7 +32,6 @@ public class QuestionBankAddBo {
     private String bankName;
     /** 价格 */
     @ApiModelProperty("价格")
-    @DecimalMin(value ="0.01",message = "价格需大于0.01")
     private BigDecimal price;
     /** 开始时间 */
     @ApiModelProperty("开始时间")
@@ -47,39 +45,6 @@ public class QuestionBankAddBo {
     /** 简介 */
     @ApiModelProperty("简介")
     private String introduction;
-    /** 合格分数 */
-    @ApiModelProperty("合格分数")
-    private BigDecimal passingScore;
-    /** 考试时间 单位（秒） */
-    @ApiModelProperty("考试时间 单位（秒）")
-    private Long examTime;
-    /** 单选题数量 */
-    @ApiModelProperty("单选题数量")
-    private Long singleChoiceNum;
-    /** 单选题分值 */
-    @ApiModelProperty("单选题分值")
-    private BigDecimal singleChoiceScore;
-    /** 多选题数量 */
-    @ApiModelProperty("多选题数量")
-    private Long multipleChoiceNum;
-    /** 多选题分值 */
-    @ApiModelProperty("多选题分值")
-    private BigDecimal multipleChoiceScore;
-    /** 判断题数量 */
-    @ApiModelProperty("判断题数量")
-    private Long judgmentNum;
-    /** 判断题分值 */
-    @ApiModelProperty("判断题分值")
-    private BigDecimal judgmentScore;
-    /** 案例数量 */
-    @ApiModelProperty("案例数量")
-    private Long caseNum;
-    /** 案例分值 */
-    @ApiModelProperty("案例分值")
-    private BigDecimal caseScore;
-    /** 总分 */
-    @ApiModelProperty("总分")
-    private BigDecimal totalScore;
     /** 添加时间 */
     @ApiModelProperty("添加时间")
     private Long createTime;
@@ -91,7 +56,6 @@ public class QuestionBankAddBo {
     private Integer status;
     /** 练习类型 1普通练习 2试卷练习 3真题 */
     @ApiModelProperty("练习类型 1普通练习 2试卷练习 3真题")
-    @Min(value = 0, message = "练习类型为1,2,3")
     private Long typeId;
     /** 教师ID拼接，用,拼接 */
     @ApiModelProperty("教师ID拼接，用,拼接")

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/bo/QuestionBankEditBo.java

@@ -15,7 +15,7 @@ import java.math.BigDecimal;
  * 题库编辑对象 question_bank
  *
  * @author hjl
- * @date 2021-05-20
+ * @date 2021-05-21
  */
 @Data
 @ApiModel("题库编辑对象")
@@ -28,7 +28,7 @@ public class QuestionBankEditBo {
 
     /** 类目ID */
     @ApiModelProperty("类目ID")
-    @Min(value = 0, message = "分类ID不能为空")
+    @Min(value = 1, message = "类目ID错误")
     private Long categoryId;
 
     /** 题库名称 */
@@ -56,50 +56,6 @@ public class QuestionBankEditBo {
     @ApiModelProperty("简介")
     private String introduction;
 
-    /** 合格分数 */
-    @ApiModelProperty("合格分数")
-    private BigDecimal passingScore;
-
-    /** 考试时间 单位（秒） */
-    @ApiModelProperty("考试时间 单位（秒）")
-    private Long examTime;
-
-    /** 单选题数量 */
-    @ApiModelProperty("单选题数量")
-    private Long singleChoiceNum;
-
-    /** 单选题分值 */
-    @ApiModelProperty("单选题分值")
-    private BigDecimal singleChoiceScore;
-
-    /** 多选题数量 */
-    @ApiModelProperty("多选题数量")
-    private Long multipleChoiceNum;
-
-    /** 多选题分值 */
-    @ApiModelProperty("多选题分值")
-    private BigDecimal multipleChoiceScore;
-
-    /** 判断题数量 */
-    @ApiModelProperty("判断题数量")
-    private Long judgmentNum;
-
-    /** 判断题分值 */
-    @ApiModelProperty("判断题分值")
-    private BigDecimal judgmentScore;
-
-    /** 案例数量 */
-    @ApiModelProperty("案例数量")
-    private Long caseNum;
-
-    /** 案例分值 */
-    @ApiModelProperty("案例分值")
-    private BigDecimal caseScore;
-
-    /** 总分 */
-    @ApiModelProperty("总分")
-    private BigDecimal totalScore;
-
     /** 修改时间 */
     @ApiModelProperty("修改时间")
     private Long updateTime;
@@ -110,7 +66,6 @@ public class QuestionBankEditBo {
 
     /** 练习类型 1普通练习 2试卷练习 3真题 */
     @ApiModelProperty("练习类型 1普通练习 2试卷练习 3真题")
-    @Min(value = 0, message = "练习类型为1,2,3")
     private Long typeId;
 
     /** 教师ID拼接，用,拼接 */

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/bo/QuestionBankQueryBo.java

@@ -16,7 +16,7 @@ import com.zhongzheng.common.core.domain.BaseEntity;
  * 题库分页查询对象 question_bank
  *
  * @author hjl
- * @date 2021-05-20
+ * @date 2021-05-21
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -58,39 +58,6 @@ public class QuestionBankQueryBo extends BaseEntity {
 	/** 简介 */
 	@ApiModelProperty("简介")
 	private String introduction;
-	/** 合格分数 */
-	@ApiModelProperty("合格分数")
-	private BigDecimal passingScore;
-	/** 考试时间 单位（秒） */
-	@ApiModelProperty("考试时间 单位（秒）")
-	private Long examTime;
-	/** 单选题数量 */
-	@ApiModelProperty("单选题数量")
-	private Long singleChoiceNum;
-	/** 单选题分值 */
-	@ApiModelProperty("单选题分值")
-	private BigDecimal singleChoiceScore;
-	/** 多选题数量 */
-	@ApiModelProperty("多选题数量")
-	private Long multipleChoiceNum;
-	/** 多选题分值 */
-	@ApiModelProperty("多选题分值")
-	private BigDecimal multipleChoiceScore;
-	/** 判断题数量 */
-	@ApiModelProperty("判断题数量")
-	private Long judgmentNum;
-	/** 判断题分值 */
-	@ApiModelProperty("判断题分值")
-	private BigDecimal judgmentScore;
-	/** 案例数量 */
-	@ApiModelProperty("案例数量")
-	private Long caseNum;
-	/** 案例分值 */
-	@ApiModelProperty("案例分值")
-	private BigDecimal caseScore;
-	/** 总分 */
-	@ApiModelProperty("总分")
-	private BigDecimal totalScore;
 	/** 状态 1正常 0关闭 */
 	@ApiModelProperty("状态 1正常 0关闭")
 	private Integer status;

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/domain/ExamConfig.java

@@ -0,0 +1,78 @@
+package com.zhongzheng.modules.bank.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_config
+ *
+ * @author hjl
+ * @date 2021-05-21
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("exam_config")
+public class ExamConfig implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+
+    /** 考试配置ID */
+    @TableId(value = "id")
+    private Long id;
+
+    /** 合格分数 */
+    private BigDecimal passingScore;
+
+    /** 考试时间 单位（秒） */
+    private Long examTime;
+
+    /** 单选题数量 */
+    private Long singleChoiceNum;
+
+    /** 单选题分值 */
+    private BigDecimal singleChoiceScore;
+
+    /** 多选题数量 */
+    private Long multipleChoiceNum;
+
+    /** 多选题分值 */
+    private BigDecimal multipleChoiceScore;
+
+    /** 判断题数量 */
+    private Long judgmentNum;
+
+    /** 判断题分值 */
+    private BigDecimal judgmentScore;
+
+    /** 案例数量 */
+    private Long caseNum;
+
+    /** 案例分值 */
+    private BigDecimal caseScore;
+
+    /** 总分 */
+    private BigDecimal totalScore;
+
+    /** 添加时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+
+    /** 修改时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+
+    /** 状态 1正常 0关闭 */
+    private Integer status;
+
+    /** 类目ID */
+    private Long categoryId;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/file/domain/PdfFile.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/domain/ExamNote.java

@@ -1,4 +1,4 @@
-package com.zhongzheng.modules.file.domain;
+package com.zhongzheng.modules.bank.domain;
 
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
@@ -10,16 +10,16 @@ import java.math.BigDecimal;
 import com.zhongzheng.common.annotation.Excel;
 
 /**
- * pdf 文件对象 pdf_file
+ * 考试重点对象 exam_note
  *
  * @author hjl
- * @date 2021-05-19
+ * @date 2021-05-21
  */
 @Data
 @NoArgsConstructor
 @Accessors(chain = true)
-@TableName("pdf_file")
-public class PdfFile implements Serializable {
+@TableName("exam_note")
+public class ExamNote implements Serializable {
 
 private static final long serialVersionUID=1L;
 
@@ -31,8 +31,8 @@ private static final long serialVersionUID=1L;
     /** 分类ID */
     private Long categoryId;
 
-    /** 文件名 */
-    private String fileName;
+    /** 名称 */
+    private String name;
 
     /** 教师ID拼接，用,拼接 */
     private String teacherIds;
@@ -40,12 +40,6 @@ private static final long serialVersionUID=1L;
     /** 价格 */
     private BigDecimal price;
 
-    /** 开始时间 */
-    private Long startTime;
-
-    /** 结束时间 */
-    private Long endTime;
-
     /** 封面地址 */
     private String coverUrl;
 
@@ -63,7 +57,10 @@ private static final long serialVersionUID=1L;
     /** 状态 1正常 0关闭 */
     private Integer status;
 
-    /** 文件url */
-    private String fileUrl;
+    /** 文件url，用,拼接 */
+    private String fileUrls;
+
+    /** 排序 */
+    private Long sort;
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/domain/QuestionBank.java

@@ -13,7 +13,7 @@ import com.zhongzheng.common.annotation.Excel;
  * 题库对象 question_bank
  *
  * @author hjl
- * @date 2021-05-20
+ * @date 2021-05-21
  */
 @Data
 @NoArgsConstructor
@@ -49,39 +49,6 @@ private static final long serialVersionUID=1L;
     /** 简介 */
     private String introduction;
 
-    /** 合格分数 */
-    private BigDecimal passingScore;
-
-    /** 考试时间 单位（秒） */
-    private Long examTime;
-
-    /** 单选题数量 */
-    private Long singleChoiceNum;
-
-    /** 单选题分值 */
-    private BigDecimal singleChoiceScore;
-
-    /** 多选题数量 */
-    private Long multipleChoiceNum;
-
-    /** 多选题分值 */
-    private BigDecimal multipleChoiceScore;
-
-    /** 判断题数量 */
-    private Long judgmentNum;
-
-    /** 判断题分值 */
-    private BigDecimal judgmentScore;
-
-    /** 案例数量 */
-    private Long caseNum;
-
-    /** 案例分值 */
-    private BigDecimal caseScore;
-
-    /** 总分 */
-    private BigDecimal totalScore;
-
     /** 添加时间 */
     @TableField(fill = FieldFill.INSERT)
     private Long createTime;

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/mapper/ExamConfigMapper.java

@@ -0,0 +1,15 @@
+package com.zhongzheng.modules.bank.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.bank.domain.ExamConfig;
+
+/**
+ * 考题配置Mapper接口
+ *
+ * @author hjl
+ * @date 2021-05-21
+ */
+public interface ExamConfigMapper extends BaseMapper<ExamConfig> {
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/mapper/ExamNoteMapper.java

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.bank.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.bank.domain.ExamNote;
+
+/**
+ * 考试重点Mapper接口
+ *
+ * @author hjl
+ * @date 2021-05-21
+ */
+public interface ExamNoteMapper extends BaseMapper<ExamNote> {
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/mapper/QuestionBankMapper.java

@@ -1,6 +1,5 @@
 package com.zhongzheng.modules.bank.mapper;
 
-
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zhongzheng.modules.bank.domain.QuestionBank;
 
@@ -8,7 +7,7 @@ import com.zhongzheng.modules.bank.domain.QuestionBank;
  * 题库Mapper接口
  *
  * @author hjl
- * @date 2021-05-20
+ * @date 2021-05-21
  */
 public interface QuestionBankMapper extends BaseMapper<QuestionBank> {
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/service/IExamConfigService.java

@@ -0,0 +1,53 @@
+package com.zhongzheng.modules.bank.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.bank.bo.ExamConfigAddBo;
+import com.zhongzheng.modules.bank.bo.ExamConfigEditBo;
+import com.zhongzheng.modules.bank.bo.ExamConfigQueryBo;
+import com.zhongzheng.modules.bank.domain.ExamConfig;
+import com.zhongzheng.modules.bank.vo.ExamConfigVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 考题配置Service接口
+ *
+ * @author hjl
+ * @date 2021-05-21
+ */
+public interface IExamConfigService extends IService<ExamConfig> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	ExamConfigVo queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+	List<ExamConfigVo> queryList(ExamConfigQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入考题配置
+	 * @param bo 考题配置新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(ExamConfigAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改考题配置
+	 * @param bo 考题配置编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(ExamConfigEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/service/IExamNoteService.java

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.bank.service;
+
+import com.zhongzheng.modules.bank.bo.ExamNoteAddBo;
+import com.zhongzheng.modules.bank.bo.ExamNoteEditBo;
+import com.zhongzheng.modules.bank.bo.ExamNoteQueryBo;
+import com.zhongzheng.modules.bank.domain.ExamNote;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.bank.vo.ExamNoteVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 考试重点Service接口
+ *
+ * @author hjl
+ * @date 2021-05-21
+ */
+public interface IExamNoteService extends IService<ExamNote> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	ExamNoteVo queryById(Long fileId);
+
+	/**
+	 * 查询列表
+	 */
+	List<ExamNoteVo> queryList(ExamNoteQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入考试重点
+	 * @param bo 考试重点新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(ExamNoteAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改考试重点
+	 * @param bo 考试重点编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(ExamNoteEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/service/IQuestionBankService.java

@@ -15,7 +15,7 @@ import java.util.List;
  * 题库Service接口
  *
  * @author hjl
- * @date 2021-05-20
+ * @date 2021-05-21
  */
 public interface IQuestionBankService extends IService<QuestionBank> {
 	/**

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/service/impl/ExamConfigServiceImpl.java

@@ -0,0 +1,127 @@
+package com.zhongzheng.modules.bank.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.lang.Validator;
+import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.common.exception.CustomException;
+import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.bank.bo.ExamConfigAddBo;
+import com.zhongzheng.modules.bank.bo.ExamConfigEditBo;
+import com.zhongzheng.modules.bank.bo.ExamConfigQueryBo;
+import com.zhongzheng.modules.bank.domain.ExamConfig;
+import com.zhongzheng.modules.bank.mapper.ExamConfigMapper;
+import com.zhongzheng.modules.bank.service.IExamConfigService;
+import com.zhongzheng.modules.bank.vo.ExamConfigVo;
+import com.zhongzheng.modules.course.domain.MajorCategory;
+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 java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 考题配置Service业务层处理
+ *
+ * @author hjl
+ * @date 2021-05-21
+ */
+@Service
+public class ExamConfigServiceImpl extends ServiceImpl<ExamConfigMapper, ExamConfig> implements IExamConfigService {
+
+    @Override
+    public ExamConfigVo queryById(Long id){
+        ExamConfig db = this.baseMapper.selectById(id);
+        return BeanUtil.toBean(db, ExamConfigVo.class);
+    }
+
+    @Override
+    public List<ExamConfigVo> queryList(ExamConfigQueryBo bo) {
+        LambdaQueryWrapper<ExamConfig> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getPassingScore() != null, ExamConfig::getPassingScore, bo.getPassingScore());
+        lqw.eq(bo.getExamTime() != null, ExamConfig::getExamTime, bo.getExamTime());
+        lqw.eq(bo.getSingleChoiceNum() != null, ExamConfig::getSingleChoiceNum, bo.getSingleChoiceNum());
+        lqw.eq(bo.getSingleChoiceScore() != null, ExamConfig::getSingleChoiceScore, bo.getSingleChoiceScore());
+        lqw.eq(bo.getMultipleChoiceNum() != null, ExamConfig::getMultipleChoiceNum, bo.getMultipleChoiceNum());
+        lqw.eq(bo.getMultipleChoiceScore() != null, ExamConfig::getMultipleChoiceScore, bo.getMultipleChoiceScore());
+        lqw.eq(bo.getJudgmentNum() != null, ExamConfig::getJudgmentNum, bo.getJudgmentNum());
+        lqw.eq(bo.getJudgmentScore() != null, ExamConfig::getJudgmentScore, bo.getJudgmentScore());
+        lqw.eq(bo.getCaseNum() != null, ExamConfig::getCaseNum, bo.getCaseNum());
+        lqw.eq(bo.getCaseScore() != null, ExamConfig::getCaseScore, bo.getCaseScore());
+        lqw.eq(bo.getTotalScore() != null, ExamConfig::getTotalScore, bo.getTotalScore());
+        lqw.eq(bo.getStatus() != null, ExamConfig::getStatus, bo.getStatus());
+        lqw.eq(bo.getCategoryId() != null, ExamConfig::getCategoryId, bo.getCategoryId());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<ExamConfigVo> entity2Vo(Collection<ExamConfig> collection) {
+        List<ExamConfigVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, ExamConfigVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<ExamConfig> page = (Page<ExamConfig>)collection;
+            Page<ExamConfigVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(ExamConfigAddBo bo) {
+        ExamConfig add = BeanUtil.toBean(bo, ExamConfig.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(ExamConfigEditBo bo) {
+        ExamConfig update = BeanUtil.toBean(bo, ExamConfig.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(ExamConfig entity){
+        //TODO 做一些数据校验,如唯一约束
+        if(checkMajorCategoryIdUnique(entity)){
+            throw new CustomException("该分类ID配置已存在");
+        }
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+
+    private boolean checkMajorCategoryIdUnique(ExamConfig entity) {
+        ExamConfig info = getOne(new LambdaQueryWrapper<ExamConfig>()
+                .eq(ExamConfig::getCategoryId,entity.getCategoryId())
+                .last("limit 1"));
+        if (Validator.isNotNull(info)) {
+            return true;
+        }
+        return false;
+    }
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/service/impl/ExamNoteServiceImpl.java

@@ -0,0 +1,107 @@
+package com.zhongzheng.modules.bank.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.bank.bo.ExamNoteAddBo;
+import com.zhongzheng.modules.bank.bo.ExamNoteEditBo;
+import com.zhongzheng.modules.bank.bo.ExamNoteQueryBo;
+import com.zhongzheng.modules.bank.domain.ExamNote;
+import com.zhongzheng.modules.bank.mapper.ExamNoteMapper;
+import com.zhongzheng.modules.bank.service.IExamNoteService;
+import com.zhongzheng.modules.bank.vo.ExamNoteVo;
+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 java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 考试重点Service业务层处理
+ *
+ * @author hjl
+ * @date 2021-05-21
+ */
+@Service
+public class ExamNoteServiceImpl extends ServiceImpl<ExamNoteMapper, ExamNote> implements IExamNoteService {
+
+    @Override
+    public ExamNoteVo queryById(Long fileId){
+        ExamNote db = this.baseMapper.selectById(fileId);
+        return BeanUtil.toBean(db, ExamNoteVo.class);
+    }
+
+    @Override
+    public List<ExamNoteVo> queryList(ExamNoteQueryBo bo) {
+        LambdaQueryWrapper<ExamNote> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getCategoryId() != null, ExamNote::getCategoryId, bo.getCategoryId());
+        lqw.like(StrUtil.isNotBlank(bo.getName()), ExamNote::getName, bo.getName());
+        lqw.eq(StrUtil.isNotBlank(bo.getTeacherIds()), ExamNote::getTeacherIds, bo.getTeacherIds());
+        lqw.eq(bo.getPrice() != null, ExamNote::getPrice, bo.getPrice());
+        lqw.eq(StrUtil.isNotBlank(bo.getCoverUrl()), ExamNote::getCoverUrl, bo.getCoverUrl());
+        lqw.eq(StrUtil.isNotBlank(bo.getIntroduction()), ExamNote::getIntroduction, bo.getIntroduction());
+        lqw.eq(bo.getStatus() != null, ExamNote::getStatus, bo.getStatus());
+        lqw.eq(StrUtil.isNotBlank(bo.getFileUrls()), ExamNote::getFileUrls, bo.getFileUrls());
+        lqw.eq(bo.getSort() != null, ExamNote::getSort, bo.getSort());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<ExamNoteVo> entity2Vo(Collection<ExamNote> collection) {
+        List<ExamNoteVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, ExamNoteVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<ExamNote> page = (Page<ExamNote>)collection;
+            Page<ExamNoteVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(ExamNoteAddBo bo) {
+        ExamNote add = BeanUtil.toBean(bo, ExamNote.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(ExamNoteEditBo bo) {
+        ExamNote update = BeanUtil.toBean(bo, ExamNote.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(ExamNote entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/service/impl/QuestionBankServiceImpl.java

@@ -15,6 +15,8 @@ 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 java.util.Collection;
 import java.util.Collections;
 import java.util.List;
@@ -24,7 +26,7 @@ import java.util.stream.Collectors;
  * 题库Service业务层处理
  *
  * @author ruoyi
- * @date 2021-05-20
+ * @date 2021-05-21
  */
 @Service
 public class QuestionBankServiceImpl extends ServiceImpl<QuestionBankMapper, QuestionBank> implements IQuestionBankService {
@@ -45,17 +47,6 @@ public class QuestionBankServiceImpl extends ServiceImpl<QuestionBankMapper, Que
         lqw.eq(bo.getEndTime() != null, QuestionBank::getEndTime, bo.getEndTime());
         lqw.eq(StrUtil.isNotBlank(bo.getCoverUrl()), QuestionBank::getCoverUrl, bo.getCoverUrl());
         lqw.eq(StrUtil.isNotBlank(bo.getIntroduction()), QuestionBank::getIntroduction, bo.getIntroduction());
-        lqw.eq(bo.getPassingScore() != null, QuestionBank::getPassingScore, bo.getPassingScore());
-        lqw.eq(bo.getExamTime() != null, QuestionBank::getExamTime, bo.getExamTime());
-        lqw.eq(bo.getSingleChoiceNum() != null, QuestionBank::getSingleChoiceNum, bo.getSingleChoiceNum());
-        lqw.eq(bo.getSingleChoiceScore() != null, QuestionBank::getSingleChoiceScore, bo.getSingleChoiceScore());
-        lqw.eq(bo.getMultipleChoiceNum() != null, QuestionBank::getMultipleChoiceNum, bo.getMultipleChoiceNum());
-        lqw.eq(bo.getMultipleChoiceScore() != null, QuestionBank::getMultipleChoiceScore, bo.getMultipleChoiceScore());
-        lqw.eq(bo.getJudgmentNum() != null, QuestionBank::getJudgmentNum, bo.getJudgmentNum());
-        lqw.eq(bo.getJudgmentScore() != null, QuestionBank::getJudgmentScore, bo.getJudgmentScore());
-        lqw.eq(bo.getCaseNum() != null, QuestionBank::getCaseNum, bo.getCaseNum());
-        lqw.eq(bo.getCaseScore() != null, QuestionBank::getCaseScore, bo.getCaseScore());
-        lqw.eq(bo.getTotalScore() != null, QuestionBank::getTotalScore, bo.getTotalScore());
         lqw.eq(bo.getStatus() != null, QuestionBank::getStatus, bo.getStatus());
         lqw.eq(bo.getTypeId() != null, QuestionBank::getTypeId, bo.getTypeId());
         lqw.eq(StrUtil.isNotBlank(bo.getTeacherIds()), QuestionBank::getTeacherIds, bo.getTeacherIds());

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/vo/ExamConfigVo.java

@@ -0,0 +1,81 @@
+package com.zhongzheng.modules.bank.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.math.BigDecimal;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 考题配置视图对象 mall_package
+ *
+ * @author hjl
+ * @date 2021-05-21
+ */
+@Data
+@ApiModel("考题配置视图对象")
+public class ExamConfigVo {
+	private static final long serialVersionUID = 1L;
+
+	/** 考试配置ID */
+	@ApiModelProperty("考试配置ID")
+	private Long id;
+
+	/** 合格分数 */
+	@Excel(name = "合格分数")
+	@ApiModelProperty("合格分数")
+	private BigDecimal passingScore;
+	/** 考试时间 单位（秒） */
+	@Excel(name = "考试时间 单位" , readConverterExp = "秒=")
+	@ApiModelProperty("考试时间 单位（秒）")
+	private Long examTime;
+	/** 单选题数量 */
+	@Excel(name = "单选题数量")
+	@ApiModelProperty("单选题数量")
+	private Long singleChoiceNum;
+	/** 单选题分值 */
+	@Excel(name = "单选题分值")
+	@ApiModelProperty("单选题分值")
+	private BigDecimal singleChoiceScore;
+	/** 多选题数量 */
+	@Excel(name = "多选题数量")
+	@ApiModelProperty("多选题数量")
+	private Long multipleChoiceNum;
+	/** 多选题分值 */
+	@Excel(name = "多选题分值")
+	@ApiModelProperty("多选题分值")
+	private BigDecimal multipleChoiceScore;
+	/** 判断题数量 */
+	@Excel(name = "判断题数量")
+	@ApiModelProperty("判断题数量")
+	private Long judgmentNum;
+	/** 判断题分值 */
+	@Excel(name = "判断题分值")
+	@ApiModelProperty("判断题分值")
+	private BigDecimal judgmentScore;
+	/** 案例数量 */
+	@Excel(name = "案例数量")
+	@ApiModelProperty("案例数量")
+	private Long caseNum;
+	/** 案例分值 */
+	@Excel(name = "案例分值")
+	@ApiModelProperty("案例分值")
+	private BigDecimal caseScore;
+	/** 总分 */
+	@Excel(name = "总分")
+	@ApiModelProperty("总分")
+	private BigDecimal totalScore;
+	/** 状态 1正常 0关闭 */
+	@Excel(name = "状态 1正常 0关闭")
+	@ApiModelProperty("状态 1正常 0关闭")
+	private Integer status;
+	/** 类目ID */
+	@Excel(name = "类目ID")
+	@ApiModelProperty("类目ID")
+	private Long categoryId;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/file/vo/PdfFileVo.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/vo/ExamNoteVo.java

@@ -1,4 +1,4 @@
-package com.zhongzheng.modules.file.vo;
+package com.zhongzheng.modules.bank.vo;
 
 import com.zhongzheng.common.annotation.Excel;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -11,14 +11,14 @@ import java.util.Date;
 
 
 /**
- * pdf 文件视图对象 mall_package
+ * 考试重点视图对象 mall_package
  *
- * @author ruoyi
- * @date 2021-05-19
+ * @author hjl
+ * @date 2021-05-21
  */
 @Data
-@ApiModel("pdf 文件视图对象")
-public class PdfFileVo {
+@ApiModel("考试重点视图对象")
+public class ExamNoteVo {
 	private static final long serialVersionUID = 1L;
 
 	/** $pkColumn.columnComment */
@@ -29,10 +29,10 @@ public class PdfFileVo {
 	@Excel(name = "分类ID")
 	@ApiModelProperty("分类ID")
 	private Long categoryId;
-	/** 文件名 */
-	@Excel(name = "文件名")
-	@ApiModelProperty("文件名")
-	private String fileName;
+	/** 名称 */
+	@Excel(name = "名称")
+	@ApiModelProperty("名称")
+	private String name;
 	/** 教师ID拼接，用,拼接 */
 	@Excel(name = "教师ID拼接，用,拼接")
 	@ApiModelProperty("教师ID拼接，用,拼接")
@@ -41,14 +41,6 @@ public class PdfFileVo {
 	@Excel(name = "价格")
 	@ApiModelProperty("价格")
 	private BigDecimal price;
-	/** 开始时间 */
-	@Excel(name = "开始时间")
-	@ApiModelProperty("开始时间")
-	private Long startTime;
-	/** 结束时间 */
-	@Excel(name = "结束时间")
-	@ApiModelProperty("结束时间")
-	private Long endTime;
 	/** 封面地址 */
 	@Excel(name = "封面地址")
 	@ApiModelProperty("封面地址")
@@ -61,9 +53,13 @@ public class PdfFileVo {
 	@Excel(name = "状态 1正常 0关闭")
 	@ApiModelProperty("状态 1正常 0关闭")
 	private Integer status;
-	/** 文件url */
-	@Excel(name = "文件url")
-	@ApiModelProperty("文件url")
-	private String fileUrl;
+	/** 文件url，用,拼接 */
+	@Excel(name = "文件url，用,拼接")
+	@ApiModelProperty("文件url，用,拼接")
+	private String fileUrls;
+	/** 排序 */
+	@Excel(name = "排序")
+	@ApiModelProperty("排序")
+	private Long sort;
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/vo/QuestionBankVo.java

@@ -14,7 +14,7 @@ import java.util.Date;
  * 题库视图对象 mall_package
  *
  * @author hjl
- * @date 2021-05-20
+ * @date 2021-05-21
  */
 @Data
 @ApiModel("题库视图对象")
@@ -53,50 +53,6 @@ public class QuestionBankVo {
 	@Excel(name = "简介")
 	@ApiModelProperty("简介")
 	private String introduction;
-	/** 合格分数 */
-	@Excel(name = "合格分数")
-	@ApiModelProperty("合格分数")
-	private BigDecimal passingScore;
-	/** 考试时间 单位（秒） */
-	@Excel(name = "考试时间 单位" , readConverterExp = "秒=")
-	@ApiModelProperty("考试时间 单位（秒）")
-	private Long examTime;
-	/** 单选题数量 */
-	@Excel(name = "单选题数量")
-	@ApiModelProperty("单选题数量")
-	private Long singleChoiceNum;
-	/** 单选题分值 */
-	@Excel(name = "单选题分值")
-	@ApiModelProperty("单选题分值")
-	private BigDecimal singleChoiceScore;
-	/** 多选题数量 */
-	@Excel(name = "多选题数量")
-	@ApiModelProperty("多选题数量")
-	private Long multipleChoiceNum;
-	/** 多选题分值 */
-	@Excel(name = "多选题分值")
-	@ApiModelProperty("多选题分值")
-	private BigDecimal multipleChoiceScore;
-	/** 判断题数量 */
-	@Excel(name = "判断题数量")
-	@ApiModelProperty("判断题数量")
-	private Long judgmentNum;
-	/** 判断题分值 */
-	@Excel(name = "判断题分值")
-	@ApiModelProperty("判断题分值")
-	private BigDecimal judgmentScore;
-	/** 案例数量 */
-	@Excel(name = "案例数量")
-	@ApiModelProperty("案例数量")
-	private Long caseNum;
-	/** 案例分值 */
-	@Excel(name = "案例分值")
-	@ApiModelProperty("案例分值")
-	private BigDecimal caseScore;
-	/** 总分 */
-	@Excel(name = "总分")
-	@ApiModelProperty("总分")
-	private BigDecimal totalScore;
 	/** 状态 1正常 0关闭 */
 	@Excel(name = "状态 1正常 0关闭")
 	@ApiModelProperty("状态 1正常 0关闭")

zhongzheng-system/src/main/java/com/zhongzheng/modules/file/mapper/PdfFileMapper.java

@@ -1,14 +0,0 @@
-package com.zhongzheng.modules.file.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zhongzheng.modules.file.domain.PdfFile;
-
-/**
- * pdf 文件Mapper接口
- *
- * @author hjl
- * @date 2021-05-19
- */
-public interface PdfFileMapper extends BaseMapper<PdfFile> {
-
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/file/service/IPdfFileService.java

@@ -1,52 +0,0 @@
-package com.zhongzheng.modules.file.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zhongzheng.modules.file.bo.PdfFileAddBo;
-import com.zhongzheng.modules.file.bo.PdfFileEditBo;
-import com.zhongzheng.modules.file.bo.PdfFileQueryBo;
-import com.zhongzheng.modules.file.domain.PdfFile;
-import com.zhongzheng.modules.file.vo.PdfFileVo;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * pdf 文件Service接口
- *
- * @author hjl
- * @date 2021-05-19
- */
-public interface IPdfFileService extends IService<PdfFile> {
-	/**
-	 * 查询单个
-	 * @return
-	 */
-	PdfFileVo queryById(Long fileId);
-
-	/**
-	 * 查询列表
-	 */
-	List<PdfFileVo> queryList(PdfFileQueryBo bo);
-
-	/**
-	 * 根据新增业务对象插入pdf 文件
-	 * @param bo pdf 文件新增业务对象
-	 * @return
-	 */
-	Boolean insertByAddBo(PdfFileAddBo bo);
-
-	/**
-	 * 根据编辑业务对象修改pdf 文件
-	 * @param bo pdf 文件编辑业务对象
-	 * @return
-	 */
-	Boolean updateByEditBo(PdfFileEditBo bo);
-
-	/**
-	 * 校验并删除数据
-	 * @param ids 主键集合
-	 * @param isValid 是否校验,true-删除前校验,false-不校验
-	 * @return
-	 */
-	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/file/service/impl/PdfFileServiceImpl.java

@@ -1,112 +0,0 @@
-package com.zhongzheng.modules.file.service.impl;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.util.StrUtil;
-import com.zhongzheng.common.exception.CustomException;
-import com.zhongzheng.common.utils.DateUtils;
-import com.zhongzheng.modules.file.bo.PdfFileAddBo;
-import com.zhongzheng.modules.file.bo.PdfFileEditBo;
-import com.zhongzheng.modules.file.bo.PdfFileQueryBo;
-import com.zhongzheng.modules.file.domain.PdfFile;
-import com.zhongzheng.modules.file.mapper.PdfFileMapper;
-import com.zhongzheng.modules.file.service.IPdfFileService;
-import com.zhongzheng.modules.file.vo.PdfFileVo;
-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 java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * pdf 文件Service业务层处理
- *
- * @author hjl
- * @date 2021-05-19
- */
-@Service
-public class PdfFileServiceImpl extends ServiceImpl<PdfFileMapper, PdfFile> implements IPdfFileService {
-
-    @Override
-    public PdfFileVo queryById(Long fileId){
-        PdfFile db = this.baseMapper.selectById(fileId);
-        return BeanUtil.toBean(db, PdfFileVo.class);
-    }
-
-    @Override
-    public List<PdfFileVo> queryList(PdfFileQueryBo bo) {
-        LambdaQueryWrapper<PdfFile> lqw = Wrappers.lambdaQuery();
-        lqw.eq(bo.getCategoryId() != null, PdfFile::getCategoryId, bo.getCategoryId());
-        lqw.like(StrUtil.isNotBlank(bo.getFileName()), PdfFile::getFileName, bo.getFileName());
-        lqw.eq(StrUtil.isNotBlank(bo.getTeacherIds()), PdfFile::getTeacherIds, bo.getTeacherIds());
-        lqw.eq(bo.getPrice() != null, PdfFile::getPrice, bo.getPrice());
-        lqw.eq(bo.getStartTime() != null, PdfFile::getStartTime, bo.getStartTime());
-        lqw.eq(bo.getEndTime() != null, PdfFile::getEndTime, bo.getEndTime());
-        lqw.eq(StrUtil.isNotBlank(bo.getCoverUrl()), PdfFile::getCoverUrl, bo.getCoverUrl());
-        lqw.eq(StrUtil.isNotBlank(bo.getIntroduction()), PdfFile::getIntroduction, bo.getIntroduction());
-        lqw.eq(bo.getStatus() != null, PdfFile::getStatus, bo.getStatus());
-        lqw.eq(StrUtil.isNotBlank(bo.getFileUrl()), PdfFile::getFileUrl, bo.getFileUrl());
-        return entity2Vo(this.list(lqw));
-    }
-
-    /**
-    * 实体类转化成视图对象
-    *
-    * @param collection 实体类集合
-    * @return
-    */
-    private List<PdfFileVo> entity2Vo(Collection<PdfFile> collection) {
-        List<PdfFileVo> voList = collection.stream()
-                .map(any -> BeanUtil.toBean(any, PdfFileVo.class))
-                .collect(Collectors.toList());
-        if (collection instanceof Page) {
-            Page<PdfFile> page = (Page<PdfFile>)collection;
-            Page<PdfFileVo> pageVo = new Page<>();
-            BeanUtil.copyProperties(page,pageVo);
-            pageVo.addAll(voList);
-            voList = pageVo;
-        }
-        return voList;
-    }
-
-    @Override
-    public Boolean insertByAddBo(PdfFileAddBo bo) {
-        PdfFile add = BeanUtil.toBean(bo, PdfFile.class);
-        validEntityBeforeSave(add);
-        add.setCreateTime(DateUtils.getNowTime());
-        add.setUpdateTime(DateUtils.getNowTime());
-        return this.save(add);
-    }
-
-    @Override
-    public Boolean updateByEditBo(PdfFileEditBo bo) {
-        PdfFile update = BeanUtil.toBean(bo, PdfFile.class);
-        validEntityBeforeSave(update);
-        update.setUpdateTime(DateUtils.getNowTime());
-        return this.updateById(update);
-    }
-
-    /**
-     * 保存前的数据校验
-     *
-     * @param entity 实体类数据
-     */
-    private void validEntityBeforeSave(PdfFile entity){
-        //TODO 做一些数据校验,如唯一约束
-        if(entity.getEndTime()<entity.getStartTime()){
-            throw new CustomException("结束时间须大于开始时间");
-        }
-    }
-
-    @Override
-    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        if(isValid){
-            //TODO 做一些业务上的校验,判断是否需要校验
-        }
-        return this.removeByIds(ids);
-    }
-}

zhongzheng-system/src/main/resources/mapper/modules/bank/ExamConfigMapper.xml

@@ -0,0 +1,27 @@
+<?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.bank.mapper.ExamConfigMapper">
+
+    <resultMap type="com.zhongzheng.modules.bank.domain.ExamConfig" id="ExamConfigResult">
+        <result property="id" column="id"/>
+        <result property="passingScore" column="passing_score"/>
+        <result property="examTime" column="exam_time"/>
+        <result property="singleChoiceNum" column="single_choice_num"/>
+        <result property="singleChoiceScore" column="single_choice_score"/>
+        <result property="multipleChoiceNum" column="multiple_choice_num"/>
+        <result property="multipleChoiceScore" column="multiple_choice_score"/>
+        <result property="judgmentNum" column="judgment_num"/>
+        <result property="judgmentScore" column="judgment_score"/>
+        <result property="caseNum" column="case_num"/>
+        <result property="caseScore" column="case_score"/>
+        <result property="totalScore" column="total_score"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="status" column="status"/>
+        <result property="categoryId" column="category_id"/>
+    </resultMap>
+
+
+</mapper>

zhongzheng-system/src/main/resources/mapper/modules/file/PdfFileMapper.xml → zhongzheng-system/src/main/resources/mapper/modules/bank/ExamNoteMapper.xml

@@ -2,22 +2,21 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zhongzheng.modules.file.mapper.PdfFileMapper">
+<mapper namespace="com.zhongzheng.modules.bank.mapper.ExamNoteMapper">
 
-    <resultMap type="com.zhongzheng.modules.file.domain.PdfFile" id="PdfFileResult">
+    <resultMap type="com.zhongzheng.modules.bank.domain.ExamNote" id="ExamNoteResult">
         <result property="fileId" column="file_id"/>
         <result property="categoryId" column="category_id"/>
-        <result property="fileName" column="file_name"/>
+        <result property="name" column="name"/>
         <result property="teacherIds" column="teacher_ids"/>
         <result property="price" column="price"/>
-        <result property="startTime" column="start_time"/>
-        <result property="endTime" column="end_time"/>
         <result property="coverUrl" column="cover_url"/>
         <result property="introduction" column="introduction"/>
         <result property="createTime" column="create_time"/>
         <result property="updateTime" column="update_time"/>
         <result property="status" column="status"/>
-        <result property="fileUrl" column="file_url"/>
+        <result property="fileUrls" column="file_urls"/>
+        <result property="sort" column="sort"/>
     </resultMap>
 
 

zhongzheng-system/src/main/resources/mapper/modules/bank/QuestionBankMapper.xml

@@ -13,17 +13,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="endTime" column="end_time"/>
         <result property="coverUrl" column="cover_url"/>
         <result property="introduction" column="introduction"/>
-        <result property="passingScore" column="passing_score"/>
-        <result property="examTime" column="exam_time"/>
-        <result property="singleChoiceNum" column="single_choice_num"/>
-        <result property="singleChoiceScore" column="single_choice_score"/>
-        <result property="multipleChoiceNum" column="multiple_choice_num"/>
-        <result property="multipleChoiceScore" column="multiple_choice_score"/>
-        <result property="judgmentNum" column="judgment_num"/>
-        <result property="judgmentScore" column="judgment_score"/>
-        <result property="caseNum" column="case_num"/>
-        <result property="caseScore" column="case_score"/>
-        <result property="totalScore" column="total_score"/>
         <result property="createTime" column="create_time"/>
         <result property="updateTime" column="update_time"/>
         <result property="status" column="status"/>