新增命题统计

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

@@ -0,0 +1,122 @@
+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.StatisticsStatusEnum;
+import com.qmth.teachcloud.common.base.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 命题统计表
+ * </p>
+ *
+ * @author wangliang
+ * @since 2021-09-09
+ */
+@ApiModel(value = "TCStatistics对象", description = "命题统计表")
+public class TCStatistics extends BaseEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+
+    @ApiModelProperty(value = "课程代码")
+    private String courseCode;
+
+    @ApiModelProperty(value = "任课老师id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long teacherId;
+
+    @ApiModelProperty(value = "班级id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long clazzId;
+
+    @ApiModelProperty(value = "试卷编号")
+    private String paperNumber;
+
+    @ApiModelProperty(value = "印刷计划id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long printPlanId;
+
+    @ApiModelProperty(value = "总印份数")
+    private Integer printSum;
+
+    @ApiModelProperty(value = "完成状态，FINISH：已完成，UN_FINISH：未完成")
+    private StatisticsStatusEnum status;
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    @Override
+    public Long getId() {
+        return id;
+    }
+
+    @Override
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getCourseCode() {
+        return courseCode;
+    }
+
+    public void setCourseCode(String courseCode) {
+        this.courseCode = courseCode;
+    }
+
+    public Long getTeacherId() {
+        return teacherId;
+    }
+
+    public void setTeacherId(Long teacherId) {
+        this.teacherId = teacherId;
+    }
+
+    public Long getClazzId() {
+        return clazzId;
+    }
+
+    public void setClazzId(Long clazzId) {
+        this.clazzId = clazzId;
+    }
+
+    public String getPaperNumber() {
+        return paperNumber;
+    }
+
+    public void setPaperNumber(String paperNumber) {
+        this.paperNumber = paperNumber;
+    }
+
+    public Long getPrintPlanId() {
+        return printPlanId;
+    }
+
+    public void setPrintPlanId(Long printPlanId) {
+        this.printPlanId = printPlanId;
+    }
+
+    public Integer getPrintSum() {
+        return printSum;
+    }
+
+    public void setPrintSum(Integer printSum) {
+        this.printSum = printSum;
+    }
+
+    public StatisticsStatusEnum getStatus() {
+        return status;
+    }
+
+    public void setStatus(StatisticsStatusEnum status) {
+        this.status = status;
+    }
+}

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

@@ -0,0 +1,42 @@
+package com.qmth.distributed.print.business.enums;
+
+import java.util.Objects;
+
+/**
+ * @Description: 统计状态 enum
+ * @Param:
+ * @return:
+ * @Author: wangliang
+ * @Date: 2021/9/9
+ */
+public enum StatisticsStatusEnum {
+
+    FINISH("已完成"),
+
+    UN_FINISH("未完成");
+
+    private String title;
+
+    private StatisticsStatusEnum(String title) {
+        this.title = title;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    /**
+     * 状态转换 toName
+     *
+     * @param title
+     * @return
+     */
+    public static String convertToName(String title) {
+        for (StatisticsStatusEnum e : StatisticsStatusEnum.values()) {
+            if (Objects.equals(title, e.getTitle())) {
+                return e.name();
+            }
+        }
+        return null;
+    }
+}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/TCStatisticsMapper.java

@@ -0,0 +1,16 @@
+package com.qmth.distributed.print.business.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.qmth.distributed.print.business.entity.TCStatistics;
+
+/**
+ * <p>
+ * 命题统计表 Mapper 接口
+ * </p>
+ *
+ * @author wangliang
+ * @since 2021-09-09
+ */
+public interface TCStatisticsMapper extends BaseMapper<TCStatistics> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.qmth.distributed.print.business.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.qmth.distributed.print.business.entity.TCStatistics;
+
+/**
+ * <p>
+ * 命题统计表 服务类
+ * </p>
+ *
+ * @author wangliang
+ * @since 2021-09-09
+ */
+public interface TCStatisticsService extends IService<TCStatistics> {
+
+}

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

@@ -0,0 +1,20 @@
+package com.qmth.distributed.print.business.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qmth.distributed.print.business.entity.TCStatistics;
+import com.qmth.distributed.print.business.mapper.TCStatisticsMapper;
+import com.qmth.distributed.print.business.service.TCStatisticsService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 命题统计表 服务实现类
+ * </p>
+ *
+ * @author wangliang
+ * @since 2021-09-09
+ */
+@Service
+public class TCStatisticsServiceImpl extends ServiceImpl<TCStatisticsMapper, TCStatistics> implements TCStatisticsService {
+
+}

distributed-print-business/src/main/resources/mapper/TCStatisticsMapper.xml

@@ -0,0 +1,5 @@
+<?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.qmth.distributed.print.business.mapper.TCStatisticsMapper">
+
+</mapper>

distributed-print/src/main/java/com/qmth/distributed/print/api/TCStatisticsController.java

@@ -0,0 +1,58 @@
+package com.qmth.distributed.print.api;
+
+
+import com.qmth.boot.api.constant.ApiConstant;
+import com.qmth.distributed.print.business.entity.TCStatistics;
+import com.qmth.distributed.print.business.enums.StatisticsStatusEnum;
+import com.qmth.distributed.print.business.service.TCStatisticsService;
+import com.qmth.teachcloud.common.util.Result;
+import com.qmth.teachcloud.common.util.ResultUtil;
+import io.swagger.annotations.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+
+/**
+ * <p>
+ * 命题统计表 前端控制器
+ * </p>
+ *
+ * @author wangliang
+ * @since 2021-09-09
+ */
+@Api(tags = "命题统计Controller")
+@RestController
+@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.statistics}")
+//@Aac(auth = BOOL.FALSE, strict = BOOL.FALSE)
+public class TCStatisticsController {
+    private final static Logger log = LoggerFactory.getLogger(TCStatisticsController.class);
+
+    @Resource
+    TCStatisticsService tcStatisticsService;
+
+    @ApiOperation(value = "命题计划统计-导入")
+    @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = Result.class)})
+    @RequestMapping(value = "/import", method = RequestMethod.POST)
+    public Result dataImport(@ApiParam(value = "上传文件", required = true) @RequestParam MultipartFile file) {
+        return ResultUtil.ok();
+    }
+
+    @ApiOperation(value = "命题计划统计-列表")
+    @ApiResponses({@ApiResponse(code = 200, message = "命题统计信息", response = TCStatistics.class)})
+    @RequestMapping(value = "/list", method = RequestMethod.POST)
+    public Result list(@ApiParam(value = "学院名称", required = false) @RequestParam(required = false) String collegeName,
+                       @ApiParam(value = "部门名称", required = false) @RequestParam(required = false) String teachingRoomName,
+                       @ApiParam(value = "完成状态", required = false) @RequestParam(required = false) StatisticsStatusEnum status,
+                       @ApiParam(value = "课程名称", required = false) @RequestParam(required = false) String courseName,
+                       @ApiParam(value = "任课老师名称", required = false) @RequestParam(required = false) String teacherName,
+                       @ApiParam(value = "页码", required = true) @RequestParam Integer pageNumber,
+                       @ApiParam(value = "数量", required = true) @RequestParam Integer pageSize) {
+        return ResultUtil.ok();
+    }
+}

distributed-print/src/main/java/com/qmth/distributed/print/api/TFFlowController.java

@@ -2,8 +2,6 @@ package com.qmth.distributed.print.api;
 
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.qmth.boot.api.annotation.Aac;
-import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.boot.api.exception.ApiException;
 import com.qmth.distributed.print.business.bean.params.FlowApproveParam;
@@ -25,11 +23,9 @@ import com.qmth.teachcloud.common.entity.BasicAttachment;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.enums.*;
 import com.qmth.teachcloud.common.service.BasicAttachmentService;
-import com.qmth.teachcloud.common.util.AesUtil;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
 import com.qmth.teachcloud.common.util.ServletUtil;
-import com.sun.org.apache.xpath.internal.operations.Bool;
 import io.swagger.annotations.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

distributed-print/src/main/resources/application-dev.properties

@@ -108,6 +108,7 @@ prefix.url.data=admin/data
 prefix.url.work=admin/work
 prefix.url.client=admin/client
 prefix.url.flow=admin/flow
+prefix.url.statistics=admin/statistics
 
 #\u65E5\u671F\u683C\u5F0F\u5316
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss

teachcloud-common/src/main/java/com/qmth/teachcloud/common/entity/TBTask.java

@@ -29,7 +29,7 @@ public class TBTask extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty(value = "任务类型，USER_IMPORT：用户导入， QUESTION_MISSION_BATCH_CREATE：批量新建命题任务， SAMPLE_EXPORT：导出审核样本， PAPER_DOWNLOAD：卷库下载， EXAMINATION_IMPORT：考务数据导入， EXAMINATION_EXPORT：考务数据导出， PRINT_PDF_DOWNLOAD：批量下载pdf， CREATE_PDF：生成pdf， COURSE_IMPORT：课程导入")
+    @ApiModelProperty(value = "任务类型，USER_IMPORT：用户导入， QUESTION_MISSION_BATCH_CREATE：批量新建命题任务， SAMPLE_EXPORT：导出审核样本， PAPER_DOWNLOAD：卷库下载， EXAMINATION_IMPORT：考务数据导入， EXAMINATION_EXPORT：考务数据导出， PRINT_PDF_DOWNLOAD：批量下载pdf， CREATE_PDF：生成pdf， COURSE_IMPORT：课程导入，STATISTICS_IMPORT：命题统计导入")
     @TableField(value = "type")
     private TaskTypeEnum type;
 

teachcloud-common/src/main/java/com/qmth/teachcloud/common/enums/TaskTypeEnum.java

@@ -35,7 +35,9 @@ public enum TaskTypeEnum {
 
     DATA_CALCULATE("数据计算"),
 
-    CREATE_TASK_PRINT("发布印刷任务");
+    CREATE_TASK_PRINT("发布印刷任务"),
+
+    STATISTICS_IMPORT("命题统计导入");
 
     private String title;