分布式印刷 部分映射类修改

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/params/analyze/GradeBatchParam.java

@@ -0,0 +1,38 @@
+package com.qmth.distributed.print.business.bean.params.analyze;
+
+import io.swagger.annotations.ApiModelProperty;
+import org.hibernate.validator.constraints.Range;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Description: 教研分析批次参数
+ * @Author: CaoZixuan
+ * @Date: 2022-05-24
+ */
+public class GradeBatchParam {
+    @ApiModelProperty(value = "批次名称")
+    @NotNull(message = "请输入批次名称")
+    private String batchName;
+
+    @ApiModelProperty(value = "批次时刻")
+    @NotNull(message = "请选择批次时刻")
+    @Range(min = 1L, message = "请选择批次时刻")
+    private Long batchTime;
+
+    public String getBatchName() {
+        return batchName;
+    }
+
+    public void setBatchName(String batchName) {
+        this.batchName = batchName;
+    }
+
+    public Long getBatchTime() {
+        return batchTime;
+    }
+
+    public void setBatchTime(Long batchTime) {
+        this.batchTime = batchTime;
+    }
+}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/result/analyze/GradeBatchResult.java

@@ -0,0 +1,59 @@
+package com.qmth.distributed.print.business.bean.result.analyze;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.qmth.distributed.print.business.enums.GradeAnalyzePaperStatusEnum;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @Description: 批次查询返回对象
+ * @Author: CaoZixuan
+ * @Date: 2022-05-24
+ */
+public class GradeBatchResult {
+    @ApiModelProperty(value = "批次id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+
+    @ApiModelProperty(value = "批次名称")
+    private String batchName;
+
+    @ApiModelProperty(value = "批次时间")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long batchTime;
+
+    @ApiModelProperty(value = "批次状态")
+    private GradeAnalyzePaperStatusEnum status;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getBatchName() {
+        return batchName;
+    }
+
+    public void setBatchName(String batchName) {
+        this.batchName = batchName;
+    }
+
+    public Long getBatchTime() {
+        return batchTime;
+    }
+
+    public void setBatchTime(Long batchTime) {
+        this.batchTime = batchTime;
+    }
+
+    public GradeAnalyzePaperStatusEnum getStatus() {
+        return status;
+    }
+
+    public void setStatus(GradeAnalyzePaperStatusEnum status) {
+        this.status = status;
+    }
+}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/GradeBatch.java

@@ -2,6 +2,7 @@ package com.qmth.distributed.print.business.entity;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.qmth.distributed.print.business.enums.GradeAnalyzePaperStatusEnum;
 import com.qmth.teachcloud.common.base.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -35,9 +36,12 @@ public class GradeBatch extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "批次名称（2020~2021学年上学期期末考试）")
     private String batchName;
 
-    @ApiModelProperty(value = "分析批次时间")
+    @ApiModelProperty(value = "分析批次时刻")
     private Long batchTime;
 
+    @ApiModelProperty(value = "批次状态")
+    private GradeAnalyzePaperStatusEnum status;
+
     public Long getSchoolId() {
         return schoolId;
     }
@@ -77,4 +81,12 @@ public class GradeBatch extends BaseEntity implements Serializable {
     public void setBatchTime(Long batchTime) {
         this.batchTime = batchTime;
     }
+
+    public GradeAnalyzePaperStatusEnum getStatus() {
+        return status;
+    }
+
+    public void setStatus(GradeAnalyzePaperStatusEnum status) {
+        this.status = status;
+    }
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/GradeBatchPaper.java

@@ -2,7 +2,9 @@ package com.qmth.distributed.print.business.entity;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.qmth.distributed.print.business.enums.GradeAnalyzePaperStatusEnum;
 import com.qmth.teachcloud.common.base.BaseEntity;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -38,6 +40,9 @@ public class GradeBatchPaper extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "试卷名称")
     private String paperName;
 
+    @ApiModelProperty(value = "分析试卷状态")
+    private GradeAnalyzePaperStatusEnum status;
+
     public Long getBatchId() {
         return batchId;
     }
@@ -77,4 +82,12 @@ public class GradeBatchPaper extends BaseEntity implements Serializable {
     public void setPaperName(String paperName) {
         this.paperName = paperName;
     }
+
+    public GradeAnalyzePaperStatusEnum getStatus() {
+        return status;
+    }
+
+    public void setStatus(GradeAnalyzePaperStatusEnum status) {
+        this.status = status;
+    }
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/enums/GradeAnalyzePaperStatusEnum.java

@@ -0,0 +1,24 @@
+package com.qmth.distributed.print.business.enums;
+
+/**
+ * @Description: 教研分析试卷状态枚举类
+ * @Author: CaoZixuan
+ * @Date: 2022-05-24
+ */
+public enum GradeAnalyzePaperStatusEnum {
+    SETTING_GRADE_PAPER("设置分析试卷"),
+    PUSH_GRADE_BATCH("推送教研分析批次数据"),
+    SETTING_GRADE_PAPER_PARAM("设置分析试卷参数"),
+    READY_TO_CALCULATE("待计算"),
+    FINISH_CALCULATE("完成计算"),
+    ;
+    private final String desc;
+
+    GradeAnalyzePaperStatusEnum(String desc) {
+        this.desc = desc;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/GradeBatchService.java

@@ -1,6 +1,10 @@
 package com.qmth.distributed.print.business.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.qmth.distributed.print.business.bean.params.analyze.GradeBatchParam;
+import com.qmth.distributed.print.business.bean.result.TeachCourseResult;
+import com.qmth.distributed.print.business.bean.result.analyze.GradeBatchResult;
 import com.qmth.distributed.print.business.entity.GradeBatch;
 
 /**
@@ -13,4 +17,21 @@ import com.qmth.distributed.print.business.entity.GradeBatch;
  */
 public interface GradeBatchService extends IService<GradeBatch> {
 
+    /**
+     * 分析批次分页查询
+     *
+     * @param batchName  批次名称
+     * @param pageNumber 分页页数
+     * @param pageSize   分页容量
+     * @return 查询结果
+     */
+    IPage<GradeBatchResult> gradeBatchPage(String batchName, int pageNumber, int pageSize);
+
+    /**
+     * 创建教研分析批次
+     *
+     * @param gradeBatchParam 分析批次参数
+     * @return 批次id
+     */
+    Long editGradeBatch(GradeBatchParam gradeBatchParam);
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/GradeBatchServiceImpl.java

@@ -1,10 +1,14 @@
 package com.qmth.distributed.print.business.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qmth.distributed.print.business.bean.params.analyze.GradeBatchParam;
+import com.qmth.distributed.print.business.bean.result.analyze.GradeBatchResult;
 import com.qmth.distributed.print.business.entity.GradeBatch;
 import com.qmth.distributed.print.business.mapper.GradeBatchMapper;
 import com.qmth.distributed.print.business.service.GradeBatchService;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * <p>
@@ -17,4 +21,14 @@ import org.springframework.stereotype.Service;
 @Service
 public class GradeBatchServiceImpl extends ServiceImpl<GradeBatchMapper, GradeBatch> implements GradeBatchService {
 
+    @Override
+    public IPage<GradeBatchResult> gradeBatchPage(String batchName, int pageNumber, int pageSize) {
+        return null;
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public Long editGradeBatch(GradeBatchParam gradeBatchParam) {
+        return null;
+    }
 }