3.3.0 update

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/ExamPaperStructurePageDto.java

@@ -1,81 +0,0 @@
-package com.qmth.distributed.print.business.bean.dto;
-
-import com.qmth.distributed.print.business.entity.ExamPaperStructure;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 考试试卷结构dto
- * </p>
- *
- * @author xf
- */
-public class ExamPaperStructurePageDto extends ExamPaperStructure implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    private String taskStatus;
-
-    private String transferId;
-
-    private String cardId;
-
-    private Long examTaskId;
-
-    private String loginName;
-
-    private String realName;
-
-    @Override
-    public String getTaskStatus() {
-        return taskStatus;
-    }
-
-    @Override
-    public void setTaskStatus(String taskStatus) {
-        this.taskStatus = taskStatus;
-    }
-
-    @Override
-    public String getTransferId() {
-        return transferId;
-    }
-
-    @Override
-    public void setTransferId(String transferId) {
-        this.transferId = transferId;
-    }
-
-    public String getCardId() {
-        return cardId;
-    }
-
-    public void setCardId(String cardId) {
-        this.cardId = cardId;
-    }
-
-    public Long getExamTaskId() {
-        return examTaskId;
-    }
-
-    public void setExamTaskId(Long examTaskId) {
-        this.examTaskId = examTaskId;
-    }
-
-    public String getLoginName() {
-        return loginName;
-    }
-
-    public void setLoginName(String loginName) {
-        this.loginName = loginName;
-    }
-
-    public String getRealName() {
-        return realName;
-    }
-
-    public void setRealName(String realName) {
-        this.realName = realName;
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/marking/BasicPaperInfo.java

@@ -1,130 +0,0 @@
-package com.qmth.distributed.print.business.bean.marking;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import io.swagger.annotations.ApiModelProperty;
-import org.hibernate.validator.constraints.Length;
-
-import javax.validation.constraints.NotNull;
-
-/**
- * @Description 基础试卷信息
- * @Author CaoZixuan
- * @Date 2022-04-13
- */
-public class BasicPaperInfo {
-    @ApiModelProperty(value = "试卷结构表id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long examPaperStructureId;
-
-    @ApiModelProperty(value = "考试id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long examId;
-
-    @ApiModelProperty(value = "云阅卷考试id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long thirdRelateId;
-
-    @ApiModelProperty(value = "云阅卷考试名称")
-    private String thirdRelateName;
-
-    @ApiModelProperty(value = "课程名称")
-    private String courseName;
-
-    @ApiModelProperty(value = "课程编号")
-    private String courseCode;
-
-    @ApiModelProperty(value = "试卷编号")
-    private String paperNumber;
-
-    @ApiModelProperty(value = "试卷类型(A,B)")
-    @NotNull(message = "请提供试卷类型")
-    @Length(min = 1,message = "请提供试卷类型")
-    private String paperType;
-
-    @ApiModelProperty(value = "课程创建的任务序号")
-    private String sequence;
-
-    @ApiModelProperty(value = "是否开启分班阅（1：开启，0：关闭）（默认0）")
-    private Boolean openClassReading;
-
-    public Long getExamPaperStructureId() {
-        return examPaperStructureId;
-    }
-
-    public void setExamPaperStructureId(Long examPaperStructureId) {
-        this.examPaperStructureId = examPaperStructureId;
-    }
-
-    public Long getExamId() {
-        return examId;
-    }
-
-    public void setExamId(Long examId) {
-        this.examId = examId;
-    }
-
-    public Long getThirdRelateId() {
-        return thirdRelateId;
-    }
-
-    public void setThirdRelateId(Long thirdRelateId) {
-        this.thirdRelateId = thirdRelateId;
-    }
-
-    public String getThirdRelateName() {
-        return thirdRelateName;
-    }
-
-    public void setThirdRelateName(String thirdRelateName) {
-        this.thirdRelateName = thirdRelateName;
-    }
-
-    public String getCourseName() {
-        return courseName;
-    }
-
-    public void setCourseName(String courseName) {
-        this.courseName = courseName;
-    }
-
-    public String getCourseCode() {
-        return courseCode;
-    }
-
-    public void setCourseCode(String courseCode) {
-        this.courseCode = courseCode;
-    }
-
-    public String getPaperNumber() {
-        return paperNumber;
-    }
-
-    public void setPaperNumber(String paperNumber) {
-        this.paperNumber = paperNumber;
-    }
-
-    public String getPaperType() {
-        return paperType;
-    }
-
-    public void setPaperType(String paperType) {
-        this.paperType = paperType;
-    }
-
-    public String getSequence() {
-        return sequence;
-    }
-
-    public void setSequence(String sequence) {
-        this.sequence = sequence;
-    }
-
-    public Boolean getOpenClassReading() {
-        return openClassReading;
-    }
-
-    public void setOpenClassReading(Boolean openClassReading) {
-        this.openClassReading = openClassReading;
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/marking/ClassMarker.java

@@ -1,77 +0,0 @@
-package com.qmth.distributed.print.business.bean.marking;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * @Description: 班级评卷员信息
- */
-public class ClassMarker {
-    @ApiModelProperty(value = "评卷员id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private String id;
-
-    @ApiModelProperty("姓名")
-    private String name;
-
-    @ApiModelProperty("账号")
-    private String loginName;
-
-    @ApiModelProperty("显示名称")
-    private String label;
-
-    @ApiModelProperty("所属机构")
-    private String orgName;
-
-    @ApiModelProperty("班级")
-    private String className;
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getLoginName() {
-        return loginName;
-    }
-
-    public void setLoginName(String loginName) {
-        this.loginName = loginName;
-    }
-
-    public String getLabel() {
-        return label;
-    }
-
-    public void setLabel(String label) {
-        this.label = label;
-    }
-
-    public String getOrgName() {
-        return orgName;
-    }
-
-    public void setOrgName(String orgName) {
-        this.orgName = orgName;
-    }
-
-    public String getClassName() {
-        return className;
-    }
-
-    public void setClassName(String className) {
-        this.className = className;
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/marking/EvaluationParameters.java

@@ -1,57 +0,0 @@
-package com.qmth.distributed.print.business.bean.marking;
-
-import io.swagger.annotations.ApiModelProperty;
-
-import javax.validation.constraints.NotNull;
-import java.util.List;
-
-/**
- * @Description: 评卷参数JSON
- * @Author: CaoZixuan
- * @Date: 2022-04-13
- */
-public class EvaluationParameters {
-    @ApiModelProperty(value = "基础试卷信息")
-    private BasicPaperInfo basicPaperInfo;
-
-    @ApiModelProperty(value = "试卷结构信息")
-    private PaperStructureInfo paperStructureInfo;
-
-    @ApiModelProperty(value = "分组信息")
-    private List<GroupInfo> groupInfo;
-
-    @ApiModelProperty(value = "分班阅信息")
-    private List<ClassMarker> classInfo;
-
-    public BasicPaperInfo getBasicPaperInfo() {
-        return basicPaperInfo;
-    }
-
-    public void setBasicPaperInfo(BasicPaperInfo basicPaperInfo) {
-        this.basicPaperInfo = basicPaperInfo;
-    }
-
-    public PaperStructureInfo getPaperStructureInfo() {
-        return paperStructureInfo;
-    }
-
-    public void setPaperStructureInfo(PaperStructureInfo paperStructureInfo) {
-        this.paperStructureInfo = paperStructureInfo;
-    }
-
-    public List<GroupInfo> getGroupInfo() {
-        return groupInfo;
-    }
-
-    public void setGroupInfo(List<GroupInfo> groupInfo) {
-        this.groupInfo = groupInfo;
-    }
-
-    public List<ClassMarker> getClassInfo() {
-        return classInfo;
-    }
-
-    public void setClassInfo(List<ClassMarker> classInfo) {
-        this.classInfo = classInfo;
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/marking/GroupInfo.java

@@ -1,91 +0,0 @@
-package com.qmth.distributed.print.business.bean.marking;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.util.List;
-
-/**
- * @Description: 试卷分组信息
- * @Author: CaoZixuan
- * @Date: 2022-04-13
- */
-public class GroupInfo {
-    @ApiModelProperty(value = "分组ID（前端参数）")
-    private String id;
-    @ApiModelProperty(value = "分组序号")
-    private Integer groupNumber;
-
-    @ApiModelProperty(value = "是否开启双评 true:开启双评 false:关闭双评")
-    private Double doubleRate;
-
-    @ApiModelProperty(value = "仲裁阈值")
-    private Double arbitrateThreshold;
-
-    @ApiModelProperty(value = "分组对应的题目集合")
-    private List<Question> questions;
-
-    @ApiModelProperty(value = "评卷员集合")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private List<Marker> markerList;
-
-    @ApiModelProperty(value = "图片配置")
-    private List<PictureConfig> pictureConfigList;
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public Integer getGroupNumber() {
-        return groupNumber;
-    }
-
-    public void setGroupNumber(Integer groupNumber) {
-        this.groupNumber = groupNumber;
-    }
-
-    public Double getDoubleRate() {
-        return doubleRate;
-    }
-
-    public void setDoubleRate(Double doubleRate) {
-        this.doubleRate = doubleRate;
-    }
-
-    public Double getArbitrateThreshold() {
-        return arbitrateThreshold;
-    }
-
-    public void setArbitrateThreshold(Double arbitrateThreshold) {
-        this.arbitrateThreshold = arbitrateThreshold;
-    }
-
-    public List<Question> getQuestions() {
-        return questions;
-    }
-
-    public void setQuestions(List<Question> questions) {
-        this.questions = questions;
-    }
-
-    public List<Marker> getMarkerList() {
-        return markerList;
-    }
-
-    public void setMarkerList(List<Marker> markerList) {
-        this.markerList = markerList;
-    }
-
-    public List<PictureConfig> getPictureConfigList() {
-        return pictureConfigList;
-    }
-
-    public void setPictureConfigList(List<PictureConfig> pictureConfigList) {
-        this.pictureConfigList = pictureConfigList;
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/marking/Marker.java

@@ -1,68 +0,0 @@
-package com.qmth.distributed.print.business.bean.marking;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * @Description: 评卷员信息
- * @Author: CaoZixuan
- * @Date: 2022-04-13
- */
-public class Marker {
-    @ApiModelProperty(value = "评卷员id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private String id;
-
-    @ApiModelProperty("姓名")
-    private String name;
-
-    @ApiModelProperty("账号")
-    private String loginName;
-
-    @ApiModelProperty("显示名称")
-    private String label;
-
-    @ApiModelProperty("所属机构")
-    private String orgName;
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getLoginName() {
-        return loginName;
-    }
-
-    public void setLoginName(String loginName) {
-        this.loginName = loginName;
-    }
-
-    public String getLabel() {
-        return label;
-    }
-
-    public void setLabel(String label) {
-        this.label = label;
-    }
-
-    public String getOrgName() {
-        return orgName;
-    }
-
-    public void setOrgName(String orgName) {
-        this.orgName = orgName;
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/marking/PaperStructureInfo.java

@@ -1,34 +0,0 @@
-package com.qmth.distributed.print.business.bean.marking;
-
-import io.swagger.annotations.ApiModelProperty;
-
-import java.util.List;
-
-/**
- * @Description: 试卷结构
- * @Author: CaoZixuan
- * @Date: 2022-04-13
- */
-public class PaperStructureInfo {
-    @ApiModelProperty(value = "客观题结构")
-    private List<Question> objectiveQuestionList;
-
-    @ApiModelProperty(value = "主观题结构")
-    private List<Question> subjectiveQuestionList;
-
-    public List<Question> getObjectiveQuestionList() {
-        return objectiveQuestionList;
-    }
-
-    public void setObjectiveQuestionList(List<Question> objectiveQuestionList) {
-        this.objectiveQuestionList = objectiveQuestionList;
-    }
-
-    public List<Question> getSubjectiveQuestionList() {
-        return subjectiveQuestionList;
-    }
-
-    public void setSubjectiveQuestionList(List<Question> subjectiveQuestionList) {
-        this.subjectiveQuestionList = subjectiveQuestionList;
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/marking/PictureConfig.java

@@ -1,65 +0,0 @@
-package com.qmth.distributed.print.business.bean.marking;
-
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * @Description: 分组图片设置
- * @Author: CaoZixuan
- * @Date: 2022-04-14
- */
-public class PictureConfig {
-    @ApiModelProperty(value = "图片序号")
-    private Integer i;
-
-    @ApiModelProperty(value = "左上角X坐标")
-    private Double x;
-
-    @ApiModelProperty(value = "左上角y坐标")
-    private Double y;
-
-    @ApiModelProperty(value = "裁切区宽度")
-    private Double w;
-
-    @ApiModelProperty(value = "裁切区高度")
-    private Double h;
-
-    public Integer getI() {
-        return i;
-    }
-
-    public void setI(Integer i) {
-        this.i = i;
-    }
-
-    public Double getX() {
-        return x;
-    }
-
-    public void setX(Double x) {
-        this.x = x;
-    }
-
-    public Double getY() {
-        return y;
-    }
-
-    public void setY(Double y) {
-        this.y = y;
-    }
-
-    public Double getW() {
-        return w;
-    }
-
-    public void setW(Double w) {
-        this.w = w;
-    }
-
-    public Double getH() {
-        return h;
-    }
-
-    public void setH(Double h) {
-        this.h = h;
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/marking/status/AnswerFile.java

@@ -1,24 +0,0 @@
-package com.qmth.distributed.print.business.bean.marking.status;
-
-public class AnswerFile {
-
-    private Boolean save;
-
-    private Boolean sync;
-
-    public Boolean getSave() {
-        return save;
-    }
-
-    public void setSave(Boolean save) {
-        this.save = save;
-    }
-
-    public Boolean getSync() {
-        return sync;
-    }
-
-    public void setSync(Boolean sync) {
-        this.sync = sync;
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/marking/status/ExamPaperStructureStatus.java

@@ -1,68 +0,0 @@
-package com.qmth.distributed.print.business.bean.marking.status;
-
-public class ExamPaperStructureStatus {
-
-    private Structure structure;
-    private Group group;
-    private MarkerClass markerClass;
-    private Objective objective;
-    private MarkerLeader markerLeader;
-    private Marker marker;
-    private AnswerFile answerFile;
-
-    public Structure getStructure() {
-        return structure;
-    }
-
-    public void setStructure(Structure structure) {
-        this.structure = structure;
-    }
-
-    public Group getGroup() {
-        return group;
-    }
-
-    public void setGroup(Group group) {
-        this.group = group;
-    }
-
-    public MarkerClass getMarkerClass() {
-        return markerClass;
-    }
-
-    public void setMarkerClass(MarkerClass markerClass) {
-        this.markerClass = markerClass;
-    }
-
-    public Objective getObjective() {
-        return objective;
-    }
-
-    public void setObjective(Objective objective) {
-        this.objective = objective;
-    }
-
-    public MarkerLeader getMarkerLeader() {
-        return markerLeader;
-    }
-
-    public void setMarkerLeader(MarkerLeader markerLeader) {
-        this.markerLeader = markerLeader;
-    }
-
-    public Marker getMarker() {
-        return marker;
-    }
-
-    public void setMarker(Marker marker) {
-        this.marker = marker;
-    }
-
-    public AnswerFile getAnswerFile() {
-        return answerFile;
-    }
-
-    public void setAnswerFile(AnswerFile answerFile) {
-        this.answerFile = answerFile;
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/marking/status/Group.java

@@ -1,24 +0,0 @@
-package com.qmth.distributed.print.business.bean.marking.status;
-
-public class Group {
-
-    private Boolean save;
-
-    private Boolean sync;
-
-    public Boolean getSave() {
-        return save;
-    }
-
-    public void setSave(Boolean save) {
-        this.save = save;
-    }
-
-    public Boolean getSync() {
-        return sync;
-    }
-
-    public void setSync(Boolean sync) {
-        this.sync = sync;
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/marking/status/Marker.java

@@ -1,24 +0,0 @@
-package com.qmth.distributed.print.business.bean.marking.status;
-
-public class Marker {
-
-    private Boolean save;
-
-    private Boolean sync;
-
-    public Boolean getSave() {
-        return save;
-    }
-
-    public void setSave(Boolean save) {
-        this.save = save;
-    }
-
-    public Boolean getSync() {
-        return sync;
-    }
-
-    public void setSync(Boolean sync) {
-        this.sync = sync;
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/marking/status/MarkerClass.java

@@ -1,24 +0,0 @@
-package com.qmth.distributed.print.business.bean.marking.status;
-
-public class MarkerClass {
-
-    private Boolean save;
-
-    private Boolean sync;
-
-    public Boolean getSave() {
-        return save;
-    }
-
-    public void setSave(Boolean save) {
-        this.save = save;
-    }
-
-    public Boolean getSync() {
-        return sync;
-    }
-
-    public void setSync(Boolean sync) {
-        this.sync = sync;
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/marking/status/MarkerLeader.java

@@ -1,24 +0,0 @@
-package com.qmth.distributed.print.business.bean.marking.status;
-
-public class MarkerLeader {
-
-    private Boolean save;
-
-    private Boolean sync;
-
-    public Boolean getSave() {
-        return save;
-    }
-
-    public void setSave(Boolean save) {
-        this.save = save;
-    }
-
-    public Boolean getSync() {
-        return sync;
-    }
-
-    public void setSync(Boolean sync) {
-        this.sync = sync;
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/marking/status/Objective.java

@@ -1,24 +0,0 @@
-package com.qmth.distributed.print.business.bean.marking.status;
-
-public class Objective {
-
-    private Boolean save;
-
-    private Boolean sync;
-
-    public Boolean getSave() {
-        return save;
-    }
-
-    public void setSave(Boolean save) {
-        this.save = save;
-    }
-
-    public Boolean getSync() {
-        return sync;
-    }
-
-    public void setSync(Boolean sync) {
-        this.sync = sync;
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/marking/status/Structure.java

@@ -1,24 +0,0 @@
-package com.qmth.distributed.print.business.bean.marking.status;
-
-public class Structure {
-
-    private Boolean save;
-
-    private Boolean sync;
-
-    public Boolean getSave() {
-        return save;
-    }
-
-    public void setSave(Boolean save) {
-        this.save = save;
-    }
-
-    public Boolean getSync() {
-        return sync;
-    }
-
-    public void setSync(Boolean sync) {
-        this.sync = sync;
-    }
-}

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

@@ -1,53 +0,0 @@
-package com.qmth.distributed.print.business.enums;
-
-import com.qmth.teachcloud.common.enums.EnumResult;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 考试试卷结构同步状态
- */
-public enum ExamPaperStructureStatusTypeEnum {
-
-    STRUCTURE("structure","试卷结构"),
-    GROUP("group","分组、分组绑定评卷员"),
-    MARKER_CLASS("markerClass","评卷员绑定班级"),
-    OBJECTIVE("objective","客观题标签"),
-    MARKER_LEADER("markerLeader","科组长"),
-    MARKER("marker","评卷员"),
-    ANSWER_FILE("answerFile","标答文件");
-
-    ExamPaperStructureStatusTypeEnum(String type, String desc) {
-        this.type = type;
-        this.desc = desc;
-    }
-
-    private String type;
-    private String desc;
-
-    public String getType() {
-        return type;
-    }
-
-    public String getDesc() {
-        return desc;
-    }
-
-    /**
-     * @return
-     */
-    public static List<EnumResult> listTypes() {
-        List<EnumResult> list = new ArrayList<EnumResult>();
-        for (ExamPaperStructureStatusTypeEnum value : ExamPaperStructureStatusTypeEnum.values()) {
-            EnumResult result = new EnumResult();
-            result.setName(value.name());
-            result.setOrdinal(value.ordinal());
-            result.setCode(null);
-            result.setDesc(value.getDesc());
-            list.add(result);
-        }
-        return list;
-    }
-
-}

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

@@ -1,14 +1,7 @@
 package com.qmth.distributed.print.business.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.qmth.distributed.print.business.bean.dto.ExamPaperStructurePageDto;
 import com.qmth.distributed.print.business.entity.ExamPaperStructure;
-import com.qmth.teachcloud.common.bean.dto.DataPermissionRule;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
 
 /**
  * <p>

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

@@ -1,17 +0,0 @@
-package com.qmth.distributed.print.business.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.qmth.distributed.print.business.entity.TSyncExamLog;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * <p>
- * 同步考生成绩汇总表 Mapper 接口
- * </p>
- */
-public interface TSyncExamLogMapper extends BaseMapper<TSyncExamLog> {
-
-    IPage<TSyncExamLog> list(Page<TSyncExamLog> iPage, @Param("semesterId") Long semesterId, @Param("examId") Long examId);
-}

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

@@ -1,20 +0,0 @@
-package com.qmth.distributed.print.business.service;
-
-import com.qmth.teachcloud.common.entity.SysUser;
-
-/**
- * @Description: 云阅卷用户推送服务接口
- * @Author: CaoZixuan
- * @Date: 2022-08-02
- */
-public interface CloudUserPushService {
-
-    /**
-     * 推送云阅卷用户
-     *
-     * @param userId      用户id
-     * @param requestUser 请求用户
-     */
-    void pushCloudUser(Long userId, SysUser requestUser) throws IllegalAccessException;
-
-}

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

@@ -1,20 +0,0 @@
-package com.qmth.distributed.print.business.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.qmth.distributed.print.business.entity.TSyncExamLog;
-
-/**
- * <p>
- * 同步考生成绩汇总表 服务类
- * </p>
- */
-public interface TSyncExamLogService extends IService<TSyncExamLog> {
-
-    IPage<TSyncExamLog> list(Page<TSyncExamLog> iPage, Long semesterId, Long examId);
-
-    void syncStudentScore(Long semesterId, Long examId, Long thirdRelateId);
-
-    TSyncExamLog selectBySchoolIdAndSemesterIdAndExamId(Long schoolId, Long semesterId, Long examId, Long thirdRelateId);
-}

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

@@ -1,24 +0,0 @@
-package com.qmth.distributed.print.business.service.impl;
-
-import com.qmth.distributed.print.business.service.CloudUserPushService;
-import com.qmth.teachcloud.common.entity.SysUser;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @Description: 云阅卷用户推送服务类
- * @Author: CaoZixuan
- * @Date: 2022-08-02
- */
-@Service
-public class CloudUserPushServiceImpl implements CloudUserPushService {
-
-    @Override
-    public void pushCloudUser(Long userId, SysUser requestUser) throws IllegalAccessException {
-        List<Long> userIdList = new ArrayList<>();
-        userIdList.add(userId);
-    }
-
-}

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

@@ -45,15 +45,9 @@ public class OpenApiServiceImpl implements OpenApiService {
     @Resource
     ExamTaskService examTaskService;
 
-    @Resource
-    BasicMajorService basicMajorService;
-
     @Resource
     private TSyncExamStudentScoreService tSyncExamStudentScoreService;
 
-    @Resource
-    private GradeBatchStudentService gradeBatchStudentService;
-
     @Resource
     private GradeBatchStudentClazzService gradeBatchStudentClazzService;
 

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

@@ -1,113 +0,0 @@
-package com.qmth.distributed.print.business.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qmth.distributed.print.business.entity.TSyncExamLog;
-import com.qmth.distributed.print.business.mapper.TSyncExamLogMapper;
-import com.qmth.distributed.print.business.service.TSyncExamLogService;
-import com.qmth.teachcloud.common.entity.SysUser;
-import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
-import com.qmth.teachcloud.common.enums.TaskStatusEnum;
-import com.qmth.teachcloud.common.service.TeachcloudCommonService;
-import com.qmth.teachcloud.common.util.ServletUtil;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.List;
-import java.util.stream.Collectors;
-
-@Service
-public class TSyncExamLogServiceImpl extends ServiceImpl<TSyncExamLogMapper, TSyncExamLog> implements TSyncExamLogService {
-
-    @Resource
-    private TeachcloudCommonService teachcloudCommonService;
-
-    @Override
-    public IPage<TSyncExamLog> list(Page<TSyncExamLog> iPage, Long semesterId, Long examId) {
-        if (semesterId == null) {
-            throw ExceptionResultEnum.ERROR.exception("请选择学期");
-        }
-        if (examId == null) {
-            throw ExceptionResultEnum.ERROR.exception("请选择考试");
-        }
-
-        Long schoolId = Long.parseLong(ServletUtil.getRequestHeaderSchoolId().toString());
-        IPage<TSyncExamLog> examLogResultIPage = this.baseMapper.list(iPage, semesterId, examId);
-        for (TSyncExamLog record : examLogResultIPage.getRecords()) {
-            TSyncExamLog tSyncExamLog = this.selectBySchoolIdAndSemesterIdAndExamId(schoolId, semesterId, examId, record.getThirdRelateId());
-            if (tSyncExamLog == null) {
-//                TSyncStmmsExam tSyncStmmsExam = tSyncStmmsExamService.getBySchoolIdAndExamId(schoolId, null, examId);
-//                if (tSyncStmmsExam != null) {
-//                    record.setExamName(tSyncStmmsExam.getExamName());
-//                }
-            } else {
-                BeanUtils.copyProperties(tSyncExamLog, record);
-            }
-            // 拼接错误日志访问url
-            if (StringUtils.isNotBlank(record.getErrorFilePath())) {
-                record.setErrorFileUrl(teachcloudCommonService.filePreview(record.getErrorFilePath()));
-            }
-        }
-        return examLogResultIPage;
-    }
-
-    @Override
-    public void syncStudentScore(Long semesterId, Long examId, Long thirdRelateId) {
-        if (semesterId == null) {
-            throw ExceptionResultEnum.ERROR.exception("请选择学期");
-        }
-        if (examId == null) {
-            throw ExceptionResultEnum.ERROR.exception("请选择考试");
-        }
-
-        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-
-        // 校验任务是否进行中
-        QueryWrapper<TSyncExamLog> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(TSyncExamLog::getSemesterId, semesterId)
-                .eq(TSyncExamLog::getExamId, examId)
-                .eq(TSyncExamLog::getThirdRelateId, thirdRelateId);
-        List<TSyncExamLog> tSyncExamLogList = this.list(queryWrapper);
-        if (!tSyncExamLogList.isEmpty()) {
-            List<TSyncExamLog> notFinishTsyncExamLogList = tSyncExamLogList.stream().filter(m -> !TaskStatusEnum.FINISH.equals(m.getStatus())).collect(Collectors.toList());
-            if (!notFinishTsyncExamLogList.isEmpty()) {
-                throw ExceptionResultEnum.ERROR.exception("当前考试有同步任务未结束，请稍候再试");
-            }
-
-            // 刪除历史数据
-            List<TSyncExamLog> finishTsyncExamLogList = tSyncExamLogList.stream().filter(m -> TaskStatusEnum.FINISH.equals(m.getStatus())).collect(Collectors.toList());
-            if (!finishTsyncExamLogList.isEmpty()) {
-                UpdateWrapper<TSyncExamLog> updateWrapper = new UpdateWrapper<>();
-                updateWrapper.lambda().eq(TSyncExamLog::getSchoolId, sysUser.getSchoolId())
-                        .eq(TSyncExamLog::getSemesterId, semesterId)
-                        .eq(TSyncExamLog::getExamId, examId)
-                        .eq(TSyncExamLog::getThirdRelateId, thirdRelateId);
-                this.remove(updateWrapper);
-            }
-        }
-
-//        TSyncStmmsExam tSyncStmmsExam = tSyncStmmsExamService.getBySchoolIdAndExamId(sysUser.getSchoolId(), null, thirdRelateId);
-//        String examName = tSyncStmmsExam == null ? null : tSyncStmmsExam.getExamName();
-//        TSyncExamLog tSyncExamLog = new TSyncExamLog(sysUser.getSchoolId(), semesterId, examId, thirdRelateId, examName, TaskStatusEnum.INIT, sysUser.getId(), System.currentTimeMillis());
-//        boolean isSave = this.save(tSyncExamLog);
-//        if (!isSave) {
-//            throw ExceptionResultEnum.ERROR.exception("创建同步任务失败，请联系管理员");
-//        }
-//        asyncScorePushService.pushTask(tSyncExamLog);
-    }
-
-    @Override
-    public TSyncExamLog selectBySchoolIdAndSemesterIdAndExamId(Long schoolId, Long semesterId, Long examId, Long thirdRleateId) {
-        QueryWrapper<TSyncExamLog> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(TSyncExamLog::getSchoolId, schoolId)
-                .eq(TSyncExamLog::getSemesterId, semesterId)
-                .eq(TSyncExamLog::getExamId, examId)
-                .eq(TSyncExamLog::getThirdRelateId, thirdRleateId);
-        return this.getOne(queryWrapper);
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/export/AsyncExportTaskTemplete.java

@@ -1,7 +1,6 @@
 package com.qmth.distributed.print.business.templete.export;
 
 import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.qmth.boot.api.exception.ApiException;
 import com.qmth.distributed.print.business.templete.importData.AsyncImportTaskTemplete;
 import com.qmth.teachcloud.common.contant.SpringContextHolder;
@@ -53,8 +52,8 @@ public abstract class AsyncExportTaskTemplete {
      */
     public void createTxt(TBTask tbTask) {
         try {
-            JSONObject json = SystemConstant.createTxt(tbTask.getSummary());
-            tbTask.setReportFilePath(json.toJSONString());
+//            JSONObject json = SystemConstant.createTxt(tbTask.getSummary());
+//            tbTask.setReportFilePath(json.toJSONString());
         } catch (Exception e) {
             log.error(SystemConstant.LOG_ERROR, e);
             StringJoiner stringJoinerSummary = new StringJoiner("").add(tbTask.getSummary()).add("\n");

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

@@ -1,55 +0,0 @@
-<?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.TSyncExamLogMapper">
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.qmth.distributed.print.business.entity.TSyncExamLog">
-        <result column="id" property="id"/>
-        <result column="school_id" property="schoolId"/>
-        <result column="semester_id" property="semesterId"/>
-        <result column="exam_id" property="examId"/>
-        <result column="exam_name" property="examName"/>
-        <result column="start_time" property="startTime"/>
-        <result column="end_time" property="endTime"/>
-        <result column="status" property="status"/>
-        <result column="result" property="result"/>
-        <result column="total_courses" property="totalCourses"/>
-        <result column="total_exam_tasks" property="totalExamTasks"/>
-        <result column="total_students" property="totalStudents"/>
-        <result column="success_students" property="successStudents"/>
-        <result column="fail_students" property="failStudents"/>
-        <result column="error_file_path" property="errorFilePath"/>
-        <result column="create_id" property="createId"/>
-        <result column="create_time" property="createTime"/>
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, school_id, exam_id, exam_name, start_time, end_time, status, `result`, total_courses, total_exam_tasks, total_students,success_students,fail_students, error_file_path, create_id, create_time
-    </sql>
-
-    <select id="list" resultType="com.qmth.distributed.print.business.entity.TSyncExamLog">
-        SELECT DISTINCT
-            ets.third_relate_id thirdRelateId,
-            tsse.exam_name examName
-        FROM
-            exam_task_sync ets
-                LEFT JOIN
-            t_sync_stmms_exam tsse ON ets.third_relate_id = tsse.exam_id
-        WHERE
-            ets.sync_status = 'FINISH'
-          AND ets.third_relate_id IS NOT NULL
-          AND EXISTS( SELECT
-                          1
-                      FROM
-                          exam_task et
-                              JOIN
-                          basic_exam be ON et.school_id = be.school_id
-                              AND et.exam_id = be.id
-                      WHERE
-                          ets.school_id = et.school_id
-                        AND ets.exam_id = et.exam_id
-                        AND ets.paper_number = et.paper_number
-                        AND be.semester_id = #{semesterId}
-                        AND be.id = #{examId})
-    </select>
-</mapper>

distributed-print/install/mysql/upgrade/3.3.0.sql

@@ -169,3 +169,11 @@ DELETE FROM `sys_privilege` WHERE (`id` = '858');
 DELETE FROM `sys_privilege` WHERE (`id` = '859');
 DELETE FROM `sys_privilege` WHERE (`id` = '882');
 DELETE FROM `sys_privilege` WHERE (`id` = '883');
+DELETE FROM `sys_privilege` WHERE (`id` = '819');
+DELETE FROM `sys_privilege` WHERE (`id` = '820');
+DELETE FROM `sys_privilege` WHERE (`id` = '821');
+DELETE FROM `sys_privilege` WHERE (`id` = '822');
+DELETE FROM `sys_privilege` WHERE (`id` = '823');
+DELETE FROM `sys_privilege` WHERE (`id` = '824');
+DELETE FROM `sys_privilege` WHERE (`id` = '818');
+

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

@@ -47,7 +47,6 @@ import java.util.Objects;
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + SystemConstant.PREFIX_URL_SYS + "/user")
 @Validated
-//@Aac(strict = BOOL.FALSE, auth = BOOL.FALSE)
 public class SysUserController {
     private final static Logger log = LoggerFactory.getLogger(SysUserController.class);
 
@@ -122,12 +121,6 @@ public class SysUserController {
         if (bindingResult.hasErrors()) {
             return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
         }
-
-        Long upUserId = sysUserService.saveUser(userSaveParams);
-//        if (SystemConstant.longNotNull(upUserId)) {
-//            SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
-//            cloudUserPushService.pushCloudUser(upUserId, requestUser);
-//        }
         return ResultUtil.ok();
     }
 

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

@@ -1,57 +0,0 @@
-package com.qmth.distributed.print.api;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.qmth.boot.api.constant.ApiConstant;
-import com.qmth.distributed.print.business.entity.TSyncExamLog;
-import com.qmth.distributed.print.business.service.TSyncExamLogService;
-import com.qmth.teachcloud.common.annotation.OperationLogDetail;
-import com.qmth.teachcloud.common.contant.SystemConstant;
-import com.qmth.teachcloud.common.enums.log.CustomizedOperationTypeEnum;
-import com.qmth.teachcloud.common.util.Result;
-import com.qmth.teachcloud.common.util.ResultUtil;
-import io.swagger.annotations.*;
-import org.springframework.validation.annotation.Validated;
-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 javax.annotation.Resource;
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-
-/**
- * <p>
- * 同步考生成绩汇总表 前端控制器
- * </p>
- */
-@Api(tags = "成绩归档Controller")
-@RestController
-@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + SystemConstant.PREFIX_URL_SYNC)
-@Validated
-public class TSyncExamLogController {
-
-    @Resource
-    TSyncExamLogService tSyncExamLogService;
-
-    @ApiOperation(value = "成绩归档查询汇总列表")
-    @ApiResponses({@ApiResponse(code = 200, message = "成绩查询汇总信息", response = TSyncExamLog.class)})
-    @RequestMapping(value = "/log/list", method = RequestMethod.POST)
-    public Result list(@ApiParam(value = "学期ID", required = false) @RequestParam(required = false) String semesterId,
-                       @ApiParam(value = "考试ID", required = false) @RequestParam(required = false) String examId,
-                       @ApiParam(value = "页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
-                       @ApiParam(value = "数量", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
-        return ResultUtil.ok(tSyncExamLogService.list(new Page<>(pageNumber, pageSize), SystemConstant.convertIdToLong(semesterId), SystemConstant.convertIdToLong(examId)));
-    }
-
-
-    @ApiOperation(value = "同步")
-    @ApiResponses({@ApiResponse(code = 200, message = "同步异步任务信息", response = TSyncExamLog.class)})
-    @RequestMapping(value = "/log/sync", method = RequestMethod.POST)
-    public Result sync(@ApiParam(value = "学期ID", required = true) @RequestParam Long semesterId,
-                       @ApiParam(value = "考试ID", required = true) @RequestParam Long examId,
-                       @ApiParam(value = "云阅卷考试ID", required = true) @RequestParam Long thirdRelateId) {
-        tSyncExamLogService.syncStudentScore(semesterId, examId, thirdRelateId);
-        return ResultUtil.ok();
-    }
-}

teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/dto/CloudUserPushStatusDto.java

@@ -1,69 +0,0 @@
-package com.qmth.teachcloud.common.bean.dto;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * @Description: 云阅卷用户推送状态
- * @Author: CaoZixuan
- * @Date: 2022-08-08
- */
-public class CloudUserPushStatusDto {
-    @ApiModelProperty(value = "学校id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long schoolId;
-
-    @ApiModelProperty(value = "用户id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long userId;
-
-    @ApiModelProperty(value = "评卷员推送状态")
-    private String markerStatus;
-
-    @ApiModelProperty(value = "科组长推送状态")
-    private String markerLeaderStatus;
-
-    @ApiModelProperty(value = "同步状态")
-    private String syncStatus;
-
-    public Long getSchoolId() {
-        return schoolId;
-    }
-
-    public void setSchoolId(Long schoolId) {
-        this.schoolId = schoolId;
-    }
-
-    public Long getUserId() {
-        return userId;
-    }
-
-    public void setUserId(Long userId) {
-        this.userId = userId;
-    }
-
-    public String getMarkerStatus() {
-        return markerStatus;
-    }
-
-    public void setMarkerStatus(String markerStatus) {
-        this.markerStatus = markerStatus;
-    }
-
-    public String getMarkerLeaderStatus() {
-        return markerLeaderStatus;
-    }
-
-    public void setMarkerLeaderStatus(String markerLeaderStatus) {
-        this.markerLeaderStatus = markerLeaderStatus;
-    }
-
-    public String getSyncStatus() {
-        return syncStatus;
-    }
-
-    public void setSyncStatus(String syncStatus) {
-        this.syncStatus = syncStatus;
-    }
-}

teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/dto/UserDto.java

@@ -3,8 +3,6 @@ package com.qmth.teachcloud.common.bean.dto;
 
 import com.qmth.teachcloud.common.entity.BasicCourse;
 import com.qmth.teachcloud.common.entity.SysRole;
-import com.qmth.teachcloud.common.enums.userPush.UserPushResultEnum;
-import io.swagger.annotations.ApiModelProperty;
 
 import java.util.List;
 
@@ -24,12 +22,6 @@ public class UserDto {
     private String orgName;
     private String code;
 
-    @ApiModelProperty(value = "评卷员推送状态")
-    private UserPushResultEnum markerStatus;
-
-    @ApiModelProperty(value = "科组长推送状态")
-    private UserPushResultEnum markerLeaderStatus;
-
     private List<SysRole> roles;
 
     private List<BasicCourse> courses;
@@ -130,19 +122,4 @@ public class UserDto {
         return code;
     }
 
-    public UserPushResultEnum getMarkerStatus() {
-        return markerStatus;
-    }
-
-    public void setMarkerStatus(UserPushResultEnum markerStatus) {
-        this.markerStatus = markerStatus;
-    }
-
-    public UserPushResultEnum getMarkerLeaderStatus() {
-        return markerLeaderStatus;
-    }
-
-    public void setMarkerLeaderStatus(UserPushResultEnum markerLeaderStatus) {
-        this.markerLeaderStatus = markerLeaderStatus;
-    }
 }

teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/params/CloudUserPushParams.java

@@ -1,42 +0,0 @@
-package com.qmth.teachcloud.common.bean.params;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.teachcloud.common.annotation.DBVerify;
-import com.qmth.teachcloud.common.enums.userPush.SpecialPrivilegeEnum;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * @Description: 推送云阅卷用户参数
- * @Author: CaoZixuan
- * @Date: 2022-08-02
- */
-public class CloudUserPushParams {
-    @ApiModelProperty(value = "系统用户id")
-    @DBVerify(value = "系统用户id",required = true)
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long userId;
-
-    @ApiModelProperty(value = "登录名")
-    @DBVerify(value = "登录名",required = true)
-    private String loginName;
-
-    @ApiModelProperty(value = "真实名称")
-    private String realName;
-
-    @ApiModelProperty(value = "密码")
-    private String password;
-
-
-
-    @ApiModelProperty(value = "是否启用")
-    private Boolean enable;
-
-    @ApiModelProperty(value = "科组长关联科目，科目代码用,分割，例如ASC,WED")
-    private String subjectCodes;
-
-    @ApiModelProperty(value = "学校id")
-    @DBVerify(value = "学校id",required = true)
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long schoolId;
-}

teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/params/PushBeforeRoleParam.java

@@ -1,43 +0,0 @@
-package com.qmth.teachcloud.common.bean.params;
-
-import com.qmth.teachcloud.common.enums.userPush.BeforeJudgeEnum;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.util.Set;
-
-/**
- * @Description: 推送前用户角色权限判断参数
- * @Author: CaoZixuan
- * @Date: 2021-10-30
- */
-public class PushBeforeRoleParam {
-    @ApiModelProperty(value = "更新前用户角色idSet")
-    private Set<Long> roleIdSet;
-
-    @ApiModelProperty(value = "更新前后对比策略枚举")
-    private BeforeJudgeEnum beforeJudgeEnum;
-
-    public PushBeforeRoleParam(Set<Long> roleIdSet, BeforeJudgeEnum beforeJudgeEnum) {
-        this.roleIdSet = roleIdSet;
-        this.beforeJudgeEnum = beforeJudgeEnum;
-    }
-
-    public PushBeforeRoleParam() {
-    }
-
-    public Set<Long> getRoleIdSet() {
-        return roleIdSet;
-    }
-
-    public void setRoleIdSet(Set<Long> roleIdSet) {
-        this.roleIdSet = roleIdSet;
-    }
-
-    public BeforeJudgeEnum getBeforeJudgeEnum() {
-        return beforeJudgeEnum;
-    }
-
-    public void setBeforeJudgeEnum(BeforeJudgeEnum beforeJudgeEnum) {
-        this.beforeJudgeEnum = beforeJudgeEnum;
-    }
-}

teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/params/UserPushParam.java

@@ -1,122 +0,0 @@
-package com.qmth.teachcloud.common.bean.params;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.teachcloud.common.annotation.DBVerify;
-import com.qmth.teachcloud.common.enums.userPush.SpecialPrivilegeEnum;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * @Description: 用户同步参数对象
- * @Author: CaoZixuan
- * @Date: 2021-10-27
- */
-public class UserPushParam {
-    @ApiModelProperty(value = "系统用户id")
-    @DBVerify(value = "系统用户id",required = true)
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long userId;
-
-    @ApiModelProperty(value = "关联名称（唯一标识）")
-    @DBVerify(value = "关联名称（唯一标识）",required = true)
-    private String account;
-
-    @ApiModelProperty(value = "名称")
-    private String name;
-
-    @ApiModelProperty(value = "密码")
-    private String password;
-
-    @ApiModelProperty(value = "特殊角色权限")
-    @DBVerify(value = "特殊角色权限",required = true)
-    private SpecialPrivilegeEnum role;
-
-    @ApiModelProperty(value = "是否启用")
-    private Boolean enable;
-
-    @ApiModelProperty(value = "科组长关联科目，科目代码用,分割，例如ASC,WED")
-    private String subjectCodes;
-
-    @ApiModelProperty(value = "学校id")
-    @DBVerify(value = "学校id",required = true)
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long schoolId;
-
-    @ApiModelProperty(value = "子机构编号")
-    private String orgCode;
-
-    public UserPushParam() {
-    }
-
-    public Long getUserId() {
-        return userId;
-    }
-
-    public void setUserId(Long userId) {
-        this.userId = userId;
-    }
-
-    public String getAccount() {
-        return account;
-    }
-
-    public void setAccount(String account) {
-        this.account = account;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    public SpecialPrivilegeEnum getRole() {
-        return role;
-    }
-
-    public void setRole(SpecialPrivilegeEnum role) {
-        this.role = role;
-    }
-
-    public Boolean getEnable() {
-        return enable;
-    }
-
-    public void setEnable(Boolean enable) {
-        this.enable = enable;
-    }
-
-    public String getSubjectCodes() {
-        return subjectCodes;
-    }
-
-    public void setSubjectCodes(String subjectCodes) {
-        this.subjectCodes = subjectCodes;
-    }
-
-    public Long getSchoolId() {
-        return schoolId;
-    }
-
-    public void setSchoolId(Long schoolId) {
-        this.schoolId = schoolId;
-    }
-
-    public String getOrgCode() {
-        return orgCode;
-    }
-
-    public void setOrgCode(String orgCode) {
-        this.orgCode = orgCode;
-    }
-}

teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/params/UserSaveReportParams.java

@@ -5,14 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.qmth.teachcloud.common.base.BaseEntity;
-import com.qmth.teachcloud.common.contant.SpringContextHolder;
 import com.qmth.teachcloud.common.contant.SystemConstant;
-import com.qmth.teachcloud.common.entity.SysConfig;
-import com.qmth.teachcloud.common.enums.userPush.SyncStatusEnum;
-import com.qmth.teachcloud.common.service.SysConfigService;
-import com.qmth.teachcloud.common.util.Base64Util;
 import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.lang3.StringUtils;
 import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.NotBlank;
@@ -104,10 +98,6 @@ public class UserSaveReportParams extends BaseEntity implements Serializable {
     @TableField(exist = false)
     private Long[] courseIds;
 
-    @ApiModelProperty(value = "同步状态")
-    @TableField("sync_status")
-    private SyncStatusEnum syncStatus;
-
     @ApiModelProperty("历史用户名")
     private String historicName;
 
@@ -134,14 +124,6 @@ public class UserSaveReportParams extends BaseEntity implements Serializable {
         this.enable = true;
     }
 
-    public SyncStatusEnum getSyncStatus() {
-        return syncStatus;
-    }
-
-    public void setSyncStatus(SyncStatusEnum syncStatus) {
-        this.syncStatus = syncStatus;
-    }
-
     public Long getSchoolId() {
         return schoolId;
     }

teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/result/SyncCountResult.java

@@ -1,27 +0,0 @@
-package com.qmth.teachcloud.common.bean.result;
-
-/**
- * @Description: 同步统计结果类
- * @Author: CaoZixuan
- * @Date: 2021-11-05
- */
-public class SyncCountResult {
-    private int totalCount;
-    private int correctCount;
-
-    public int getTotalCount() {
-        return totalCount;
-    }
-
-    public void setTotalCount(int totalCount) {
-        this.totalCount = totalCount;
-    }
-
-    public int getCorrectCount() {
-        return correctCount;
-    }
-
-    public void setCorrectCount(int correctCount) {
-        this.correctCount = correctCount;
-    }
-}

teachcloud-common/src/main/java/com/qmth/teachcloud/common/enums/userPush/BeforeJudgeEnum.java

@@ -1,27 +0,0 @@
-package com.qmth.teachcloud.common.enums.userPush;
-
-/**
- * @Description: 是否要根据同步之前用户状态判断是否发送禁用推送枚举类
- * @Author: CaoZixuan
- * @Date: 2021-10-30
- */
-public enum BeforeJudgeEnum {
-    FORBIDDEN_NO_NEED("只根据更新后角色权限判断,更新后即使没有特殊权限，也不发送禁用推送"),
-    FORBIDDEN_BY_BEFORE_ROLE("根据用户更新前的角色权限和更新后的对比（更新前如果特殊权限，更新后没有特殊权限则发送两条禁用推送）"),
-    FORBIDDEN_NECESSARY("不根据更新前的角色权限判断，只要更新后没有特殊权限，直接发送两条禁用推送"),
-    ;
-
-    BeforeJudgeEnum(String desc) {
-        this.desc = desc;
-    }
-
-    private String desc;
-
-    public String getDesc() {
-        return desc;
-    }
-
-    public void setDesc(String desc) {
-        this.desc = desc;
-    }
-}

teachcloud-common/src/main/java/com/qmth/teachcloud/common/enums/userPush/SyncStatusEnum.java

@@ -1,20 +0,0 @@
-package com.qmth.teachcloud.common.enums.userPush;
-
-/**
- * @Description: 用户同步云阅卷同步状态枚举类
- * @Author: CaoZixuan
- * @Date: 2021-10-27
- */
-public enum SyncStatusEnum {
-    ALREADY_PUSH("已经完成推送"),
-    NEED_PUSH_AGAIN("需要重新推送"),
-    ;
-    SyncStatusEnum(String desc) {
-        this.desc = desc;
-    }
-    private final String desc;
-
-    public String getDesc() {
-        return desc;
-    }
-}

teachcloud-common/src/main/java/com/qmth/teachcloud/common/enums/userPush/UserPushResultEnum.java

@@ -1,29 +0,0 @@
-package com.qmth.teachcloud.common.enums.userPush;
-
-/**
- * @Description: 用户推送结果枚举
- * @Author: CaoZixuan
- * @Date: 2022-08-03
- */
-public enum UserPushResultEnum {
-    BIND_SUCCESS("绑定成功", true),
-    BIND_FAILED("绑定失败", false),
-    UNBIND_SUCCESS("解绑成功", true),
-    UNBIND_FAILED("解绑失败", false),
-    ;
-    private final String desc;
-    private final boolean success;
-
-    UserPushResultEnum(String desc, boolean success) {
-        this.desc = desc;
-        this.success = success;
-    }
-
-    public String getDesc() {
-        return desc;
-    }
-
-    public boolean isSuccess() {
-        return success;
-    }
-}

teachcloud-common/src/main/java/com/qmth/teachcloud/common/enums/userPush/UserPushTrackEnum.java

@@ -1,39 +0,0 @@
-package com.qmth.teachcloud.common.enums.userPush;
-
-import java.util.Objects;
-
-/**
- * @Description: 用户推送轨迹枚举
- * @Author: CaoZixuan
- * @Date: 2021-11-04
- */
-public enum UserPushTrackEnum {
-    BIND("绑定"),
-    UNBIND("解绑"),
-    ;
-
-    UserPushTrackEnum(String desc) {
-        this.desc = desc;
-    }
-
-    private final String desc;
-
-    public String getDesc() {
-        return desc;
-    }
-
-    /**
-     * 状态转换 toName
-     *
-     * @param desc desc
-     * @return 名称
-     */
-    public static String convertToName(String desc) {
-        for (UserPushTrackEnum e : UserPushTrackEnum.values()) {
-            if (Objects.equals(desc, e.getDesc())) {
-                return e.name();
-            }
-        }
-        return null;
-    }
-}