3.4.0 删除废弃表及类

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

@@ -1,83 +0,0 @@
-package com.qmth.distributed.print.business.entity;
-
-import com.baomidou.mybatisplus.annotation.FieldStrategy;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.distributed.print.business.enums.TemplateTypeEnum;
-import com.qmth.teachcloud.common.base.BaseEntity;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 适用学院（题卡规则、模板适用学院）
- * </p>
- *
- * @author xf
- * @since 2021-03-23
- */
-@TableName("basic_template_org")
-public class BasicTemplateOrg extends BaseEntity implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "学校id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    @TableField("school_id")
-    private Long schoolId;
-
-    @ApiModelProperty(value = "机构id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    @TableField(value = "org_id", updateStrategy = FieldStrategy.IGNORED)
-    private Long orgId;
-
-    /**
-     * 模板类型：GENERIC-通卡模板，VARIABLE-变量印品模板，ORDINARY-普通印品模板，CARD_RULE-题卡规则
-     */
-    private TemplateTypeEnum type;
-    /**
-     * 通卡模板ID
-     */
-    @JsonSerialize(using = ToStringSerializer.class)
-    @TableField("rule_id")
-    private Long ruleId;
-
-    public static long getSerialVersionUID() {
-        return serialVersionUID;
-    }
-
-    public Long getSchoolId() {
-        return schoolId;
-    }
-
-    public void setSchoolId(Long schoolId) {
-        this.schoolId = schoolId;
-    }
-
-    public Long getOrgId() {
-        return orgId;
-    }
-
-    public void setOrgId(Long orgId) {
-        this.orgId = orgId;
-    }
-
-    public TemplateTypeEnum getType() {
-        return type;
-    }
-
-    public void setType(TemplateTypeEnum type) {
-        this.type = type;
-    }
-
-    public Long getRuleId() {
-        return ruleId;
-    }
-
-    public void setRuleId(Long ruleId) {
-        this.ruleId = ruleId;
-    }
-}

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

@@ -1,65 +0,0 @@
-package com.qmth.distributed.print.business.entity;
-
-import com.baomidou.mybatisplus.annotation.FieldStrategy;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.teachcloud.common.annotation.EditKey;
-import com.qmth.teachcloud.common.base.BaseEntity;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 考务数据（考场关联科目对应的卷型）
- * </p>
- *
- * @author xf
- * @since 2022-05-15
- */
-@TableName("exam_detail_course_paper_type")
-public class ExamDetailCoursePaperType implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "主键")
-    @TableId(value = "id")
-    @EditKey
-    private Long id;
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @TableField("exam_detail_course_id")
-    private Long examDetailCourseId;
-
-    @ApiModelProperty(value = "当前试卷类型")
-    @TableField("paper_type")
-    private String paperType;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getExamDetailCourseId() {
-        return examDetailCourseId;
-    }
-
-    public void setExamDetailCourseId(Long examDetailCourseId) {
-        this.examDetailCourseId = examDetailCourseId;
-    }
-
-    public String getPaperType() {
-        return paperType;
-    }
-
-    public void setPaperType(String paperType) {
-        this.paperType = paperType;
-    }
-}

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

@@ -1,291 +0,0 @@
-package com.qmth.distributed.print.business.entity;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-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.contant.SystemConstant;
-import com.qmth.teachcloud.common.enums.TaskResultEnum;
-import com.qmth.teachcloud.common.enums.TaskStatusEnum;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.File;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-
-/**
- * <p>
- * 同步考生成绩汇总表
- * </p>
- */
-@ApiModel(value = "TSyncExamLog对象", description = "同步考生成绩汇总表")
-public class TSyncExamLog implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "主键")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long id;
-
-    @ApiModelProperty(value = "学校id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long schoolId;
-
-    @ApiModelProperty(value = "考试id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long examId;
-
-    @ApiModelProperty(value = "云阅卷考试id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long thirdRelateId;
-
-    @ApiModelProperty(value = "学期id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long semesterId;
-
-    @ApiModelProperty(value = "云阅卷考试名称")
-    private String examName;
-
-    @ApiModelProperty(value = "任务状态，INIT：未开始，RUNNING：进行中，FINISH：已完成")
-    @TableField(value = "status")
-    private TaskStatusEnum status;
-
-    @ApiModelProperty(value = "数据结果，SUCCESS：成功，ERROR：失败")
-    @TableField(value = "result")
-    private TaskResultEnum result;
-
-    @ApiModelProperty(value = "开始同步时间")
-    private Long startTime;
-
-    @ApiModelProperty(value = "结束同步时间")
-    private Long endTime;
-
-    @ApiModelProperty(value = "时实信息")
-    private String summary;
-
-    @ApiModelProperty(value = "总课程数")
-    private Integer totalCourses;
-
-    @ApiModelProperty(value = "总命题任务数")
-    private Integer totalExamTasks;
-
-    @ApiModelProperty(value = "总考生数")
-    private Integer totalStudents;
-
-    @ApiModelProperty(value = "成功考生数")
-    private Integer successStudents;
-
-    @ApiModelProperty(value = "失败考生数")
-    private Integer failStudents;
-
-    @ApiModelProperty(value = "错误数据文件路径")
-    @TableField(value = "error_file_path")
-    private String errorFilePath;
-    @ApiModelProperty(value = "创建人id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long createId;
-
-    @ApiModelProperty(value = "创建时间")
-    private Long createTime;
-
-    @TableField(exist = false)
-    @ApiModelProperty(value = "错误文件访问地址")
-    String errorFileUrl;
-
-    @TableField(exist = false)
-    @ApiModelProperty(value = "状态")
-    String statusStr;
-
-    @TableField(exist = false)
-    @ApiModelProperty(value = "结果")
-    String resultStr;
-
-    public TSyncExamLog() {
-    }
-
-    public TSyncExamLog(Long schoolId, Long semesterId, Long examId, Long thirdRelateId, String examName, TaskStatusEnum status, Long createId, Long createTime) {
-        this.id = SystemConstant.getDbUuid();
-        this.schoolId = schoolId;
-        this.examId = examId;
-        this.semesterId = semesterId;
-        this.thirdRelateId = thirdRelateId;
-        this.examName = examName;
-        this.status = status;
-        this.createId = createId;
-        this.createTime = createTime;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getSchoolId() {
-        return schoolId;
-    }
-
-    public void setSchoolId(Long schoolId) {
-        this.schoolId = schoolId;
-    }
-
-    public Long getSemesterId() {
-        return semesterId;
-    }
-
-    public void setSemesterId(Long semesterId) {
-        this.semesterId = semesterId;
-    }
-
-    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 getExamName() {
-        return examName;
-    }
-
-    public void setExamName(String examName) {
-        this.examName = examName;
-    }
-
-    public TaskStatusEnum getStatus() {
-        return status;
-    }
-
-    public void setStatus(TaskStatusEnum status) {
-        this.status = status;
-    }
-
-    public TaskResultEnum getResult() {
-        return result;
-    }
-
-    public void setResult(TaskResultEnum result) {
-        this.result = result;
-    }
-
-    public Long getStartTime() {
-        return startTime;
-    }
-
-    public void setStartTime(Long startTime) {
-        this.startTime = startTime;
-    }
-
-    public Long getEndTime() {
-        return endTime;
-    }
-
-    public void setEndTime(Long endTime) {
-        this.endTime = endTime;
-    }
-
-    public String getSummary() {
-        return summary;
-    }
-
-    public void setSummary(String summary) {
-        this.summary = summary;
-    }
-
-    public Integer getTotalCourses() {
-        return totalCourses;
-    }
-
-    public void setTotalCourses(Integer totalCourses) {
-        this.totalCourses = totalCourses;
-    }
-
-    public Integer getTotalExamTasks() {
-        return totalExamTasks;
-    }
-
-    public void setTotalExamTasks(Integer totalExamTasks) {
-        this.totalExamTasks = totalExamTasks;
-    }
-
-    public Integer getTotalStudents() {
-        return totalStudents;
-    }
-
-    public Integer getSuccessStudents() {
-        return successStudents;
-    }
-
-    public void setSuccessStudents(Integer successStudents) {
-        this.successStudents = successStudents;
-    }
-
-    public Integer getFailStudents() {
-        return failStudents;
-    }
-
-    public void setFailStudents(Integer failStudents) {
-        this.failStudents = failStudents;
-    }
-
-    public void setTotalStudents(Integer totalStudents) {
-        this.totalStudents = totalStudents;
-    }
-
-    public String getErrorFilePath() {
-        return errorFilePath;
-    }
-
-    public void setErrorFilePath(String errorFilePath) {
-        this.errorFilePath = errorFilePath;
-    }
-
-    public Long getCreateId() {
-        return createId;
-    }
-
-    public void setCreateId(Long createId) {
-        this.createId = createId;
-    }
-
-    public Long getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Long createTime) {
-        this.createTime = createTime;
-    }
-
-    public String getErrorFileUrl() {
-        return errorFileUrl;
-    }
-
-    public void setErrorFileUrl(String errorFileUrl) {
-        this.errorFileUrl = errorFileUrl;
-    }
-
-    public String getStatusStr() {
-        return this.status == null ? null : this.status.getTitle();
-    }
-
-    public String getResultStr() {
-        return this.result == null ? null : this.result.getTitle();
-    }
-
-}

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

@@ -1,27 +0,0 @@
-package com.qmth.distributed.print.business.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.qmth.distributed.print.business.bean.result.TemplatePrintInfoResult;
-import com.qmth.distributed.print.business.entity.BasicTemplateOrg;
-import com.qmth.teachcloud.common.entity.SysOrg;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- * 适用学院（题卡规则、模板适用学院） Mapper 接口
- * </p>
- *
- * @author xf
- * @since 2021-03-23
- */
-public interface BasicTemplateOrgMapper extends BaseMapper<BasicTemplateOrg> {
-
-    /**
-     * 查询机构集合所使用的印品模板信息
-     * @param orgIds 机构集合
-     * @return 模板信息
-     */
-    List<TemplatePrintInfoResult> templateListByOrgIds(@Param("orgIds")List<Long> orgIds);
-}

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

@@ -1,16 +0,0 @@
-package com.qmth.distributed.print.business.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.qmth.distributed.print.business.entity.ExamDetailCoursePaperType;
-
-/**
- * <p>
- * 考务数据（考场关联科目对应的卷型） Mapper 接口
- * </p>
- *
- * @author xf
- * @since 2023-05-15
- */
-public interface ExamDetailCoursePaperTypeMapper extends BaseMapper<ExamDetailCoursePaperType> {
-
-}

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

@@ -1,35 +0,0 @@
-package com.qmth.distributed.print.business.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.qmth.distributed.print.business.entity.BasicTemplateOrg;
-import com.qmth.distributed.print.business.enums.TemplateTypeEnum;
-
-/**
- * <p>
- * 适用学院（题卡规则、模板适用学院） 服务类
- * </p>
- *
- * @author xf
- * @since 2021-03-23
- */
-public interface BasicTemplateOrgService extends IService<BasicTemplateOrg> {
-
-    void saveBatch(Long schoolId, TemplateTypeEnum type, Long ruleId, Long[] orgIds, Long createId);
-
-//    /**
-//     * 根据机构id查询所有机构集合下所使用的的模板信息
-//     *
-//     * @param ids 机构id集合
-//     * @return 模板信息集合
-//     */
-//    List<TemplatePrintInfoResult> findTemplateInfoByOrgIds(List<Long> ids);
-//
-//    /**
-//     * 查询基础机构模板对应关系根据课程编号
-//     * @param courseCode 课程编号
-//     * @param templateTypeEnum 类型
-//     * @param schoolId 学校id
-//     * @return 对应关系
-//     */
-//    List<BasicTemplateOrg> findByCourseCodeAndType(String courseCode,TemplateTypeEnum templateTypeEnum,Long schoolId);
-}

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

@@ -1,21 +0,0 @@
-package com.qmth.distributed.print.business.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.qmth.distributed.print.business.entity.ExamDetailCoursePaperType;
-
-import java.util.List;
-
-/**
- * <p>
- * 考务数据（考场关联科目对应卷型） 服务类
- * </p>
- *
- * @author xf
- * @since 2023-05-15
- */
-public interface ExamDetailCoursePaperTypeService extends IService<ExamDetailCoursePaperType> {
-
-    void deleteByExamDetailCourseId(Long examDetailCourseId);
-
-    void removeByExamDetailCourseIds(List<Long> examDetailCourseIds);
-}

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

@@ -7,16 +7,13 @@ 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.enums.TemplateTypeEnum;
 import com.qmth.distributed.print.business.mapper.BasicPrintConfigMapper;
 import com.qmth.distributed.print.business.service.BasicExamService;
 import com.qmth.distributed.print.business.service.BasicPrintConfigService;
-import com.qmth.distributed.print.business.service.BasicTemplateOrgService;
 import com.qmth.teachcloud.common.bean.dto.DataPermissionRule;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.BasicExam;
 import com.qmth.teachcloud.common.entity.BasicPrintConfig;
-import com.qmth.teachcloud.common.entity.SysOrg;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.enums.ClassifyEnum;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
@@ -27,11 +24,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
-import java.util.Set;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -46,13 +40,6 @@ public class BasicPrintConfigServiceImpl extends ServiceImpl<BasicPrintConfigMap
 
     @Resource
     private BasicExamService basicExamService;
-
-    @Resource
-    BasicTemplateOrgService basicTemplateOrgService;
-
-    @Resource
-    BasicPrintConfigService basicPrintConfigService;
-
     @Resource
     private BasicRoleDataPermissionService basicRoleDataPermissionService;
 

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

@@ -1,65 +0,0 @@
-package com.qmth.distributed.print.business.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qmth.distributed.print.business.entity.BasicTemplateOrg;
-import com.qmth.distributed.print.business.enums.TemplateTypeEnum;
-import com.qmth.distributed.print.business.mapper.BasicTemplateOrgMapper;
-import com.qmth.distributed.print.business.service.BasicTemplateOrgService;
-import com.qmth.teachcloud.common.entity.SysOrg;
-import com.qmth.teachcloud.common.service.BasicCourseService;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * <p>
- * 适用学院（题卡规则、模板适用学院） 服务实现类
- * </p>
- *
- * @author xf
- * @since 2021-03-23
- */
-@Service
-public class BasicTemplateOrgServiceImpl extends ServiceImpl<BasicTemplateOrgMapper, BasicTemplateOrg> implements BasicTemplateOrgService {
-
-    @Resource
-    private BasicTemplateOrgMapper basicTemplateOrgMapper;
-
-    @Resource
-    private BasicCourseService basicCourseService;
-
-    @Override
-    public void saveBatch(Long schoolId, TemplateTypeEnum type, Long ruleId, Long[] orgIds, Long createId) {
-        List<BasicTemplateOrg> list = new ArrayList<>();
-        for (Long orgId : orgIds) {
-            BasicTemplateOrg basicTemplateOrg = new BasicTemplateOrg();
-            basicTemplateOrg.setSchoolId(schoolId);
-            basicTemplateOrg.setType(type);
-            basicTemplateOrg.setRuleId(ruleId);
-            basicTemplateOrg.setOrgId(orgId);
-            basicTemplateOrg.insertInfo(createId);
-            list.add(basicTemplateOrg);
-        }
-        this.saveBatch(list);
-    }
-
-//    @Override
-//    public List<TemplatePrintInfoResult> findTemplateInfoByOrgIds(List<Long> ids) {
-//        return basicTemplateOrgMapper.templateListByOrgIds(ids);
-//    }
-//
-//    @Override
-//    public List<BasicTemplateOrg> findByCourseCodeAndType(String courseCode, TemplateTypeEnum templateTypeEnum, Long schoolId) {
-//        BasicCourse basicCourse = basicCourseService.getOne(new QueryWrapper<BasicCourse>().lambda().eq(BasicCourse::getSchoolId,schoolId).eq(BasicCourse::getCode,courseCode));
-//        if (Objects.isNull(basicCourse)){
-//            throw ExceptionResultEnum.ERROR.exception("未找到基础课程信息");
-//        }
-//        return this.list(new QueryWrapper<BasicTemplateOrg>().lambda()
-//                .eq(BasicTemplateOrg::getSchoolId,schoolId)
-//                .eq(BasicTemplateOrg::getType,templateTypeEnum)
-//                .eq(BasicTemplateOrg::getOrgId,basicCourse.getTeachingRoomId()));
-//    }
-}

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

@@ -1,38 +0,0 @@
-package com.qmth.distributed.print.business.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qmth.distributed.print.business.entity.ExamDetail;
-import com.qmth.distributed.print.business.entity.ExamDetailCoursePaperType;
-import com.qmth.distributed.print.business.mapper.ExamDetailCoursePaperTypeMapper;
-import com.qmth.distributed.print.business.service.ExamDetailCoursePaperTypeService;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Queue;
-
-/**
- * <p>
- * 考务数据（考场关联科目对应卷型） 服务实现类
- * </p>
- *
- * @author xf
- * @since 2023-05-15
- */
-@Service
-public class ExamDetailCoursePaperTypeServiceImpl extends ServiceImpl<ExamDetailCoursePaperTypeMapper, ExamDetailCoursePaperType> implements ExamDetailCoursePaperTypeService {
-
-    @Override
-    public void deleteByExamDetailCourseId(Long examDetailCourseId) {
-        UpdateWrapper<ExamDetailCoursePaperType> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.lambda().eq(ExamDetailCoursePaperType::getExamDetailCourseId, examDetailCourseId);
-        this.remove(updateWrapper);
-    }
-
-    @Override
-    public void removeByExamDetailCourseIds(List<Long> examDetailCourseIds) {
-        UpdateWrapper<ExamDetailCoursePaperType> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.lambda().in(ExamDetailCoursePaperType::getExamDetailCourseId, examDetailCourseIds);
-        this.remove(updateWrapper);
-    }
-}

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

@@ -25,8 +25,6 @@ import com.qmth.distributed.print.business.mapper.ExamDetailMapper;
 import com.qmth.distributed.print.business.service.*;
 import com.qmth.distributed.print.business.templete.execute.AsyncExaminationImportTemplateService;
 import com.qmth.teachcloud.common.bean.dto.DataPermissionRule;
-import com.qmth.teachcloud.common.bean.dto.MqDto;
-import com.qmth.teachcloud.common.bean.result.TbTaskDetailResult;
 import com.qmth.teachcloud.common.bean.vo.PaperInfoVo;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.*;
@@ -76,8 +74,6 @@ public class ExamDetailServiceImpl extends ServiceImpl<ExamDetailMapper, ExamDet
     @Resource
     private ExamDetailCourseService examDetailCourseService;
 
-    @Resource
-    private ExamDetailCoursePaperTypeService examDetailCoursePaperTypeService;
 
     @Resource
     private BasicExamRuleService basicExamRuleService;
@@ -1085,9 +1081,6 @@ public class ExamDetailServiceImpl extends ServiceImpl<ExamDetailMapper, ExamDet
         // 删除exam_detail_course 表数据
         examDetailCourseService.remove(new QueryWrapper<ExamDetailCourse>().lambda().in(ExamDetailCourse::getId, examDetailCourseIds));
 
-        // 删除exam_detail_course_paper_type 表数据
-        examDetailCoursePaperTypeService.removeByExamDetailCourseIds(examDetailCourseIds);
-
         // 准备删除的考务-考生表id
         List<Long> examStudentIds = examStudentService.list(new QueryWrapper<ExamStudent>().lambda().in(ExamStudent::getExamDetailCourseId, examDetailCourseIds))
                 .stream().map(ExamStudent::getId).collect(Collectors.toList());
@@ -1144,9 +1137,6 @@ public class ExamDetailServiceImpl extends ServiceImpl<ExamDetailMapper, ExamDet
                     examDetailCourse.setPaperType(null);
                 }
                 examDetailCourseService.updateBatchById(examDetailCourseList);
-
-                List<Long> examDetailCourseIds = examDetailCourseList.stream().map(ExamDetailCourse::getId).collect(Collectors.toList());
-                examDetailCoursePaperTypeService.removeByExamDetailCourseIds(examDetailCourseIds);
             }
         }
     }
@@ -1188,9 +1178,6 @@ public class ExamDetailServiceImpl extends ServiceImpl<ExamDetailMapper, ExamDet
         // 删除exam_detail_course 表数据
         examDetailCourseService.remove(new QueryWrapper<ExamDetailCourse>().lambda().in(ExamDetailCourse::getId, examDetailCourseIds));
 
-        // 删除exam_detail_course_paper_type 表数据
-        examDetailCoursePaperTypeService.removeByExamDetailCourseIds(examDetailCourseIds);
-
         // 准备删除的考务-考生表id
         List<Long> examStudentIds = examStudentService.list(new QueryWrapper<ExamStudent>().lambda().in(ExamStudent::getExamDetailCourseId, examDetailCourseIds))
                 .stream().map(ExamStudent::getId).collect(Collectors.toList());

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

@@ -154,8 +154,6 @@ public class TaskLogicServiceImpl implements TaskLogicService {
     @Resource
     BasicPrintConfigService basicPrintConfigService;
     @Resource
-    ExamDetailCoursePaperTypeService examDetailCoursePaperTypeService;
-    @Resource
     FileUploadService fileUploadService;
     @Resource
     BasicExamStudentService basicExamStudentService;
@@ -236,7 +234,6 @@ public class TaskLogicServiceImpl implements TaskLogicService {
             List<PdfDto> backupPaperPdfList = new ArrayList<>();//备份试卷
             List<PdfDto> backupCardPdfList = new ArrayList<>();//备份题卡
 
-            List<ExamDetailCoursePaperType> examDetailCoursePaperTypes = new ArrayList<>();
 
             String printContent = examPrintPlan.getPrintContent();
             if (StringUtils.isBlank(printContent)) {
@@ -308,14 +305,6 @@ public class TaskLogicServiceImpl implements TaskLogicService {
             examTaskDetail.setRelatePaperType(String.join(",", relatePaperTypes));
             examDetailCourse.setPaperType(String.join(",", relatePaperTypes));
 
-            relatePaperTypes.forEach(m -> {
-                ExamDetailCoursePaperType examDetailCoursePaperType = new ExamDetailCoursePaperType();
-                examDetailCoursePaperType.setId(SystemConstant.getDbUuid());
-                examDetailCoursePaperType.setExamDetailCourseId(examDetailCourse.getId());
-                examDetailCoursePaperType.setPaperType(m);
-                examDetailCoursePaperTypes.add(examDetailCoursePaperType);
-            });
-
             // 试卷数据组装
             if ((CreatePdfTypeEnum.ALL.equals(createPdfType) || CreatePdfTypeEnum.PAPER.equals(createPdfType)) && printContent.contains("PAPER")) {
                 List<PaperPdfDto> paperPdfDto = createPdfUtil.getPaperPdfFile(examDetailCourse.getPaperType(), examTaskDetail, fileTempList);
@@ -421,8 +410,6 @@ public class TaskLogicServiceImpl implements TaskLogicService {
             examDetailCourse.setAttachmentId(jsonObject.toJSONString());
             examTaskDetailService.saveOrUpdate(examTaskDetail);
 
-            examDetailCoursePaperTypeService.deleteByExamDetailCourseId(examDetailCourse.getId());
-            examDetailCoursePaperTypeService.saveBatch(examDetailCoursePaperTypes);
         }
         examDetailCourseService.saveOrUpdateBatch(examDetailCourseList);
 

distributed-print-business/src/main/resources/db/delete-data.sql

@@ -47,7 +47,6 @@ DELETE t FROM basic_semester t where t.school_id = #{schoolId};
 DELETE t FROM basic_teach_course t where t.school_id = #{schoolId};
 DELETE t FROM basic_student t where t.school_id = #{schoolId};
 DELETE t FROM basic_template t where t.school_id = #{schoolId};
-DELETE t FROM basic_template_org t where t.school_id = #{schoolId};
 DELETE t FROM basic_teach_clazz t where t.school_id = #{schoolId};
 DELETE t FROM basic_exam_student t where t.school_id = #{schoolId};
 DELETE t FROM basic_user_course t where t.school_id = #{schoolId};
@@ -66,7 +65,6 @@ DELETE t FROM course_dimension t where t.school_id = #{schoolId};
 DELETE t FROM exam_card_detail t where exists(select temp.* from(select ecd.id from exam_card_detail ecd join exam_card ec on ec.id = ecd.card_id where ec.school_id = #{schoolId}) temp where t.id = temp.id);
 DELETE t FROM exam_card t where t.school_id = #{schoolId};
 DELETE t FROM exam_detail t where t.school_id = #{schoolId};
-DELETE t FROM exam_detail_course_paper_type t where exists (select 1 FROM exam_detail_course a where a.school_id = #{schoolId} and t.exam_detail_course_id = a.id);
 DELETE t FROM exam_detail_course t where t.school_id = #{schoolId};
 DELETE t FROM exam_paper_group_marker t where exists(select temp.* from (select epgm.id from exam_paper_group_marker epgm join exam_paper_group epg on epg.id = epgm.group_id join exam_paper_structure eps on eps.id = epg.exam_paper_structure_id where eps.school_id = #{schoolId}) temp where temp.id = t.id);
 DELETE t FROM exam_paper_group t where exists(select temp.* from (select epg.id from exam_paper_group epg join exam_paper_structure eps on eps.id = epg.exam_paper_structure_id where eps.school_id = #{schoolId}) temp where temp.id = t.id);

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

@@ -1,47 +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.BasicTemplateOrgMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.qmth.distributed.print.business.entity.BasicTemplateOrg">
-        <result column="id" property="id"/>
-        <result column="type" property="type"/>
-        <result column="rule_id" property="ruleId"/>
-        <result column="org_id" property="orgId"/>
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id
-        ,
-        type, rule_id, org_id
-    </sql>
-    <select id="templateListByOrgIds"
-            resultType="com.qmth.distributed.print.business.bean.result.TemplatePrintInfoResult">
-        SELECT
-        DISTINCT (tmp.id) as templateId,
-        tmp.school_id as schoolId,
-        tmp.name as templateName,
-        tmp.classify as templateClassify,
-        tmp.attachment_id as attachmentId,
-        tmp.enable as enable,
-        tmp.remark as remark
-        FROM
-        basic_template_org org
-        INNER JOIN
-        basic_template tmp ON org.rule_id = tmp.id
-        <where>
-            and tmp.enable = true
-            <if test="orgIds.size() == 0">
-                AND org.org_id IN (null)
-            </if>
-            <if test="orgIds != null and orgIds != '' and orgIds.size() > 0">
-                AND org.org_id IN
-                <foreach collection="orgIds" item="item" index="index" open="(" separator="," close=")">
-                    #{item}
-                </foreach>
-            </if>
-        </where>
-    </select>
-
-</mapper>

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

@@ -22,4 +22,16 @@ DROP INDEX `operation_log_idx` ,
 ADD INDEX `operation_log_idx` USING BTREE (`school_id`, `user_id`, `privilege_id`, `operation_type`, `create_time`);
 
 update basic_operation_log t set t.operation_type = 'SAVE' where t.operation_type = 'EDIT';
-update basic_operation_log t set t.operation_type = 'OTHER' where t.operation_type = 'UN_KNOW';
+update basic_operation_log t set t.operation_type = 'OTHER' where t.operation_type = 'UN_KNOW';
+
+drop table if exists exam_detail_course_paper_type;
+drop table basic_template_org;
+drop table cloud_user_push_status;
+drop table exam_card_detail;
+drop table exam_paper_class_marker;
+drop table exam_paper_group;
+drop table exam_paper_group_marker;
+drop table exam_paper_structure;
+drop table exam_task_sync;
+drop table t_sync_exam_log;
+drop table t_sync_stmms_exam;

teachcloud-common/src/main/java/com/qmth/teachcloud/common/aspect/LogAspect.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.qmth.boot.api.exception.ApiException;
 import com.qmth.teachcloud.common.annotation.EditKey;
 import com.qmth.teachcloud.common.annotation.OperationLogDetail;
-import com.qmth.teachcloud.common.bean.dto.LogArgsDto;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.BasicOperationLog;
 import com.qmth.teachcloud.common.entity.SysPrivilege;
@@ -31,7 +30,9 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.lang.reflect.Field;
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
 
 /**
  * @Description: 日志操作记录拦截aop

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

@@ -1,37 +0,0 @@
-package com.qmth.teachcloud.common.bean.dto;
-
-import com.qmth.boot.core.solar.model.AppControl;
-import com.qmth.boot.core.solar.model.OrgInfo;
-
-import java.io.Serializable;
-
-/**
- * @Description: 鉴权org dto
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2022/9/2
- */
-public class AuthOrgInfoDto implements Serializable {
-
-    OrgInfo orgInfo;
-
-    AppControl control;
-
-    public AuthOrgInfoDto() {
-
-    }
-
-    public AuthOrgInfoDto(OrgInfo orgInfo, AppControl control) {
-        this.orgInfo = orgInfo;
-        this.control = control;
-    }
-
-    public AppControl getControl() {
-        return control;
-    }
-
-    public void setControl(AppControl control) {
-        this.control = control;
-    }
-}

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

@@ -1,32 +0,0 @@
-package com.qmth.teachcloud.common.bean.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * @Description: 日志方法中参数Dto
- * @Author: CaoZixuan
- * @Date: 2022-02-15
- */
-public class LogArgsDto {
-    @ApiModelProperty(value = "参数")
-    private Object arg;
-
-    @ApiModelProperty(value = "参数名称")
-    private String paramName;
-
-    public Object getArg() {
-        return arg;
-    }
-
-    public void setArg(Object arg) {
-        this.arg = arg;
-    }
-
-    public String getParamName() {
-        return paramName;
-    }
-
-    public void setParamName(String paramName) {
-        this.paramName = paramName;
-    }
-}

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

@@ -1,82 +0,0 @@
-package com.qmth.teachcloud.common.bean.dto;
-
-import java.util.List;
-
-/**
- * @Date: 2021/4/2.
- */
-public class LoginDto {
-
-    private String id;
-    private String schoolId;
-    private String loginName;
-    private String realName;
-    private String orgId;
-    private Boolean enable;
-    private List<String> roles;
-    private Long pwdUpdateTime;
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getSchoolId() {
-        return schoolId;
-    }
-
-    public void setSchoolId(String schoolId) {
-        this.schoolId = schoolId;
-    }
-
-    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;
-    }
-
-    public String getOrgId() {
-        return orgId;
-    }
-
-    public void setOrgId(String orgId) {
-        this.orgId = orgId;
-    }
-
-    public Boolean getEnable() {
-        return enable;
-    }
-
-    public void setEnable(Boolean enable) {
-        this.enable = enable;
-    }
-
-    public List<String> getRoles() {
-        return roles;
-    }
-
-    public void setRoles(List<String> roles) {
-        this.roles = roles;
-    }
-
-    public Long getPwdUpdateTime() {
-        return pwdUpdateTime;
-    }
-
-    public void setPwdUpdateTime(Long pwdUpdateTime) {
-        this.pwdUpdateTime = pwdUpdateTime;
-    }
-}

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

@@ -1,122 +0,0 @@
-package com.qmth.teachcloud.common.bean.dto;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.teachcloud.common.enums.PrivilegeEnum;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-
-/**
- * @Description: 修改角色privilege
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2021/10/29
- */
-@JsonInclude(JsonInclude.Include.NON_NULL)
-public class SysRolePrivilegeDto implements Serializable {
-
-    @ApiModelProperty(value = "角色权限id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    Long rolePrivilegeId;
-
-    @ApiModelProperty(value = "学校名称")
-    String schoolName;
-
-    @ApiModelProperty(value = "学校编码")
-    String schoolCode;
-
-    @ApiModelProperty(value = "角色id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    Long roleId;
-
-    @ApiModelProperty(value = "角色名称")
-    String roleName;
-
-    @ApiModelProperty(value = "权限id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    Long privilegeId;
-
-    @ApiModelProperty(value = "权限名称")
-    String privilegeName;
-
-    @ApiModelProperty(value = "权限url")
-    String privilegeUrl;
-
-    @ApiModelProperty(value = "权限类别")
-    PrivilegeEnum privilegeType;
-
-    public Long getRolePrivilegeId() {
-        return rolePrivilegeId;
-    }
-
-    public void setRolePrivilegeId(Long rolePrivilegeId) {
-        this.rolePrivilegeId = rolePrivilegeId;
-    }
-
-    public String getSchoolName() {
-        return schoolName;
-    }
-
-    public void setSchoolName(String schoolName) {
-        this.schoolName = schoolName;
-    }
-
-    public String getSchoolCode() {
-        return schoolCode;
-    }
-
-    public void setSchoolCode(String schoolCode) {
-        this.schoolCode = schoolCode;
-    }
-
-    public Long getRoleId() {
-        return roleId;
-    }
-
-    public void setRoleId(Long roleId) {
-        this.roleId = roleId;
-    }
-
-    public String getRoleName() {
-        return roleName;
-    }
-
-    public void setRoleName(String roleName) {
-        this.roleName = roleName;
-    }
-
-    public Long getPrivilegeId() {
-        return privilegeId;
-    }
-
-    public void setPrivilegeId(Long privilegeId) {
-        this.privilegeId = privilegeId;
-    }
-
-    public String getPrivilegeName() {
-        return privilegeName;
-    }
-
-    public void setPrivilegeName(String privilegeName) {
-        this.privilegeName = privilegeName;
-    }
-
-    public String getPrivilegeUrl() {
-        return privilegeUrl;
-    }
-
-    public void setPrivilegeUrl(String privilegeUrl) {
-        this.privilegeUrl = privilegeUrl;
-    }
-
-    public PrivilegeEnum getPrivilegeType() {
-        return privilegeType;
-    }
-
-    public void setPrivilegeType(PrivilegeEnum privilegeType) {
-        this.privilegeType = privilegeType;
-    }
-}

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

@@ -14,22 +14,20 @@ public class UserExportDto {
 
     private Long id;
 
-    @ExcelProperty(name = "用户名", width = 10, index = 1)
+    @ExcelProperty(name = "用户名/工号", width = 10, index = 1)
     private String loginName;
     @ExcelProperty(name = "姓名", width = 10, index = 2)
     private String realName;
-    @ExcelProperty(name = "工号", width = 10, index = 3)
-    private String code;
-    @ExcelProperty(name = "手机号", width = 15, index = 4)
+    @ExcelProperty(name = "手机号", width = 15, index = 3)
     private String mobileNumber;
     private Boolean enable;
     private Long orgId;
-    @ExcelProperty(name = "所在机构", width = 20, index = 5)
+    @ExcelProperty(name = "所属机构", width = 20, index = 4)
     private String orgName;
     private List<SysRole> roles;
-    @ExcelProperty(name = "角色", width = 30, index = 6)
+    @ExcelProperty(name = "角色", width = 30, index = 5)
     private String roleName;
-    @ExcelProperty(name = "状态", width = 8, index = 7)
+    @ExcelProperty(name = "状态", width = 8, index = 6)
     private String enableName;
 
     public Long getId() {
@@ -56,14 +54,6 @@ public class UserExportDto {
         this.realName = realName;
     }
 
-    public String getCode() {
-        return code;
-    }
-
-    public void setCode(String code) {
-        this.code = code;
-    }
-
     public String getMobileNumber() {
         return mobileNumber;
     }

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

@@ -1,63 +0,0 @@
-package com.qmth.teachcloud.common.bean.dto;
-
-
-/**
- * @Date: 2021/3/23.
- */
-public class UserRoleDto {
-
-    private String userId;
-    private String schoolId;
-    private String loginName;
-    private String realName;
-    private String roleId;
-    private String roleName;
-
-    public String getUserId() {
-        return userId;
-    }
-
-    public void setUserId(String userId) {
-        this.userId = userId;
-    }
-
-    public String getSchoolId() {
-        return schoolId;
-    }
-
-    public void setSchoolId(String schoolId) {
-        this.schoolId = schoolId;
-    }
-
-    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;
-    }
-
-    public String getRoleId() {
-        return roleId;
-    }
-
-    public void setRoleId(String roleId) {
-        this.roleId = roleId;
-    }
-
-    public String getRoleName() {
-        return roleName;
-    }
-
-    public void setRoleName(String roleName) {
-        this.roleName = roleName;
-    }
-}

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

@@ -1,35 +0,0 @@
-package com.qmth.teachcloud.common.bean.dto.stmms;
-
-import java.util.List;
-
-public class ClassMarkerDTO {
-    //是 考试ID
-    private Integer examId;
-    //是 账号
-    private String account;
-    List<String> className;
-
-    public Integer getExamId() {
-        return examId;
-    }
-
-    public void setExamId(Integer examId) {
-        this.examId = examId;
-    }
-
-    public String getAccount() {
-        return account;
-    }
-
-    public void setAccount(String account) {
-        this.account = account;
-    }
-
-    public List<String> getClassName() {
-        return className;
-    }
-
-    public void setClassName(List<String> className) {
-        this.className = className;
-    }
-}

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

@@ -1,63 +0,0 @@
-package com.qmth.teachcloud.common.bean.dto.stmms;
-
-/**
- * @Description: 云阅卷试卷结构
- * @Author: CaoZixuan
- * @Date: 2022-07-08
- */
-public class ExamCloudPaperStructDto {
-    private Boolean objective;
-    private String mainTitle;
-    private Integer mainNumber;
-    private Integer subNumber;
-    private Double totalScore;
-    private String answer;
-
-    public Boolean getObjective() {
-        return objective;
-    }
-
-    public void setObjective(Boolean objective) {
-        this.objective = objective;
-    }
-
-    public String getMainTitle() {
-        return mainTitle;
-    }
-
-    public void setMainTitle(String mainTitle) {
-        this.mainTitle = mainTitle;
-    }
-
-    public Integer getMainNumber() {
-        return mainNumber;
-    }
-
-    public void setMainNumber(Integer mainNumber) {
-        this.mainNumber = mainNumber;
-    }
-
-    public Integer getSubNumber() {
-        return subNumber;
-    }
-
-    public void setSubNumber(Integer subNumber) {
-        this.subNumber = subNumber;
-    }
-
-    public Double getTotalScore() {
-        return totalScore;
-    }
-
-    public void setTotalScore(Double totalScore) {
-        this.totalScore = totalScore;
-    }
-
-    public String getAnswer() {
-        return answer;
-    }
-
-    public void setAnswer(String answer) {
-        this.answer = answer;
-    }
-}

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

@@ -1,46 +0,0 @@
-package com.qmth.teachcloud.common.bean.dto.stmms;
-
-import java.util.List;
-
-public class GroupDTO {
-    //是 考试ID
-    private Integer examId;
-    //是 科目代码
-    private String subjectCode;
-    //是 试评数量
-    private Integer trialCount;
-
-    List<GroupDetailDTO> groups;
-
-    public Integer getExamId() {
-        return examId;
-    }
-
-    public void setExamId(Integer examId) {
-        this.examId = examId;
-    }
-
-    public String getSubjectCode() {
-        return subjectCode;
-    }
-
-    public void setSubjectCode(String subjectCode) {
-        this.subjectCode = subjectCode;
-    }
-
-    public Integer getTrialCount() {
-        return trialCount;
-    }
-
-    public void setTrialCount(Integer trialCount) {
-        this.trialCount = trialCount;
-    }
-
-    public List<GroupDetailDTO> getGroups() {
-        return groups;
-    }
-
-    public void setGroups(List<GroupDetailDTO> groups) {
-        this.groups = groups;
-    }
-}

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

@@ -1,86 +0,0 @@
-package com.qmth.teachcloud.common.bean.dto.stmms;
-
-import java.util.List;
-
-public class GroupDetailDTO {
-    //是 分组序号
-    private Integer number;
-    //否
-    private List<PicConfig> picConfig;
-    //是 双评比例 0关闭，1开启
-    private Double doubleRate;
-    //否 仲裁阈值 开启双评是必填
-    private Double arbitrateThreshold;
-    //否 合分策略 开启双评是必填 AVG("平均分", 1), MAX("最高分", 2), MIN("最低分", 3)
-    private Integer scorePolicy;
-    //否 允许全零分
-    private Boolean enableAllZero;
-    //否 评卷模式  COMMON("普通"), TRACK("轨迹")
-    private String markMode;
-    // 题目
-    private List<QuestionBaseDTO> questions;
-
-    public Integer getNumber() {
-        return number;
-    }
-
-    public void setNumber(Integer number) {
-        this.number = number;
-    }
-
-    public List<PicConfig> getPicConfig() {
-        return picConfig;
-    }
-
-    public void setPicConfig(List<PicConfig> picConfig) {
-        this.picConfig = picConfig;
-    }
-
-    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 Integer getScorePolicy() {
-        return scorePolicy;
-    }
-
-    public void setScorePolicy(Integer scorePolicy) {
-        this.scorePolicy = scorePolicy;
-    }
-
-    public Boolean getEnableAllZero() {
-        return enableAllZero;
-    }
-
-    public void setEnableAllZero(Boolean enableAllZero) {
-        this.enableAllZero = enableAllZero;
-    }
-
-    public String getMarkMode() {
-        return markMode;
-    }
-
-    public void setMarkMode(String markMode) {
-        this.markMode = markMode;
-    }
-
-    public List<QuestionBaseDTO> getQuestions() {
-        return questions;
-    }
-
-    public void setQuestions(List<QuestionBaseDTO> questions) {
-        this.questions = questions;
-    }
-}

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

@@ -1,60 +0,0 @@
-package com.qmth.teachcloud.common.bean.dto.stmms;
-
-import java.util.List;
-
-public class PaperDTO {
-
-    private Integer examId;
-
-    private String subjectCode;
-
-    private String paperType;
-
-    private Boolean objective;
-
-    private List<QuestionDTO> questions;
-
-    public PaperDTO() {
-    }
-
-    public Integer getExamId() {
-        return examId;
-    }
-
-    public void setExamId(Integer examId) {
-        this.examId = examId;
-    }
-
-    public String getSubjectCode() {
-        return subjectCode;
-    }
-
-    public void setSubjectCode(String subjectCode) {
-        this.subjectCode = subjectCode;
-    }
-
-    public String getPaperType() {
-        return paperType;
-    }
-
-    public void setPaperType(String paperType) {
-        this.paperType = paperType;
-    }
-
-    public Boolean getObjective() {
-        return objective;
-    }
-
-    public void setObjective(Boolean objective) {
-        this.objective = objective;
-    }
-
-    public List<QuestionDTO> getQuestions() {
-        return questions;
-    }
-
-    public void setQuestions(List<QuestionDTO> questions) {
-        this.questions = questions;
-    }
-
-}

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

@@ -1,54 +0,0 @@
-package com.qmth.teachcloud.common.bean.dto.stmms;
-
-public class PicConfig {
-    //i图片序号
-    private Integer i;
-    //x左上角X坐标
-    private Double x;
-    //x左上角y坐标
-    private Double y;
-    //w裁切区宽度
-    private Double w;
-    //h裁切区高度
-    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;
-    }
-}

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

@@ -1,25 +0,0 @@
-package com.qmth.teachcloud.common.bean.dto.stmms;
-
-public class QuestionBaseDTO {
-
-    private Integer mainNumber;
-
-    private String subNumber;
-
-    public Integer getMainNumber() {
-        return mainNumber;
-    }
-
-    public void setMainNumber(Integer mainNumber) {
-        this.mainNumber = mainNumber;
-    }
-
-    public String getSubNumber() {
-        return subNumber;
-    }
-
-    public void setSubNumber(String subNumber) {
-        this.subNumber = subNumber;
-    }
-
-}

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

@@ -1,56 +0,0 @@
-package com.qmth.teachcloud.common.bean.dto.stmms;
-
-public class QuestionDTO extends QuestionBaseDTO {
-
-    private String mainTitle;
-
-    private String answer;
-
-    private Double totalScore;
-
-    // 客观题类型
-    private String type;
-
-    // 客观题判分规则
-    private String objectivePolicy;
-
-    public String getMainTitle() {
-        return mainTitle;
-    }
-
-    public void setMainTitle(String mainTitle) {
-        this.mainTitle = mainTitle;
-    }
-
-    public String getAnswer() {
-        return answer;
-    }
-
-    public void setAnswer(String answer) {
-        this.answer = answer;
-    }
-
-    public Double getTotalScore() {
-        return totalScore;
-    }
-
-    public void setTotalScore(Double totalScore) {
-        this.totalScore = totalScore;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public String getObjectivePolicy() {
-        return objectivePolicy;
-    }
-
-    public void setObjectivePolicy(String objectivePolicy) {
-        this.objectivePolicy = objectivePolicy;
-    }
-}

teachcloud-common/src/main/java/com/qmth/teachcloud/common/mapper/SysUserMapper.java

@@ -120,8 +120,6 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
      */
     List<SysUserResult> findCourseSysUserResultList(@Param("schoolId") Long schoolId, @Param("courseCode") String courseCode);
 
-    List<UserRoleDto> findByRoleTypeAndOrgId(@Param("roleType") String roleType, @Param("orgId") Long orgId);
-
     /**
      * 查找内置老师
      *

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/SysOrgServiceImpl.java

@@ -70,24 +70,6 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
     @Override
     public List<OrgDto> listOrgTree(RoleTypeEnum specialPrivilegeEnum, boolean withoutPrintingRoom, String courseCode, Set<Long> orgIds) {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
-//        List<SysUserResult> sysUserResultList = sysUserService.findSysUserResultList();
-//        List<SysUserResult> finalSysUserResultList = sysUserResultList.stream()
-//                .filter(e -> {
-//                    if (Objects.isNull(specialPrivilegeEnum)) {
-//                        return true;
-//                    } else {
-//                        // 用户特殊权限
-//                        SpecialPrivilegeEnum userP = sysUserService.findUserSpecialPrivilegeByUserId(e.getId(), schoolId);
-//                        // 如果用户是复合权限，条件为复合、评卷员、科组长都可以
-//                        if (SpecialPrivilegeEnum.COMPOSITE.equals(userP)) {
-//                            return SpecialPrivilegeEnum.COMPOSITE.equals(specialPrivilegeEnum) || SpecialPrivilegeEnum.MARKER.equals(specialPrivilegeEnum) || SpecialPrivilegeEnum.SUBJECT_HEADER.equals(specialPrivilegeEnum);
-//                        } else {
-//                            // 如果用户不是复合条件，用户权限和条件权限对应
-//                            return specialPrivilegeEnum.equals(userP);
-//                        }
-//                    }
-//                }).collect(Collectors.toList());
-
         List<SysUserResult> finalSysUserResultList = sysUserService.findSysUserResultListNew(schoolId, specialPrivilegeEnum);
         if (!CollectionUtils.isEmpty(finalSysUserResultList)) {
             finalSysUserResultList.forEach(e -> {

teachcloud-common/src/main/resources/mapper/SysPrivilegeMapper.xml

@@ -37,52 +37,4 @@
     <select id="findByConnectByParentId" resultType="com.qmth.teachcloud.common.entity.SysPrivilege">
         SELECT su.* FROM (SELECT @a AS _id, (SELECT @a := sp.parent_id FROM sys_privilege sp WHERE sp.id = _id) AS parent_id FROM (SELECT @a := #{privilegeId}) vars, sys_privilege h) temp JOIN sys_privilege su ON temp._id = su.id
     </select>
-
-<!--    <select id="getRolePrivilegeList" resultType="com.qmth.teachcloud.common.bean.dto.SysRolePrivilegeDto">-->
-<!--        select-->
-<!--        bs.name as schoolName,-->
-<!--        bs.code as schoolCode,-->
-<!--        sr.id as roleId,-->
-<!--        sr.name as roleName,-->
-<!--        sp.id as privilegeId,-->
-<!--        sp.name as privilegeName,-->
-<!--        sp.url as privilegeUrl,-->
-<!--        sp.`type` as privilegeType,-->
-<!--        srp.id as rolePrivilegeId-->
-<!--        from-->
-<!--        sys_role_privilege srp-->
-<!--        join sys_privilege sp on-->
-<!--        sp.id = srp.privilege_id-->
-<!--        join sys_role sr on-->
-<!--        sr.id = srp.role_id-->
-<!--        join basic_school bs on-->
-<!--        bs.id = sr.school_id-->
-<!--        where-->
-<!--        srp.enable = true-->
-<!--        and sp.enable = true-->
-<!--        and sr.enable = true-->
-<!--        and srp.role_id <![CDATA[ <> ]]> 1-->
-<!--        and srp.privilege_id <![CDATA[ > ]]> 100000-->
-<!--    </select>-->
-
-<!--    <select id="getRolePrivilegeCount" resultType="java.lang.Integer">-->
-<!--        select count(1) from-->
-<!--        sys_role_privilege srp-->
-<!--        join sys_privilege sp on-->
-<!--        sp.id = srp.privilege_id-->
-<!--        join sys_role sr on-->
-<!--        sr.id = srp.role_id-->
-<!--        join basic_school bs on-->
-<!--        bs.id = sr.school_id-->
-<!--        where-->
-<!--        srp.enable = true-->
-<!--        and sp.enable = true-->
-<!--        and sr.enable = true-->
-<!--        and srp.role_id <![CDATA[ <> ]]> 1-->
-<!--        and srp.privilege_id <![CDATA[ > ]]> 100000-->
-<!--    </select>-->
-
-<!--    <select id="findByDefault" resultType="com.qmth.teachcloud.common.entity.SysPrivilege">-->
-<!--        select * from sys_privilege sp where sp.id <![CDATA[ < ]]> 100000-->
-<!--    </select>-->
 </mapper>

teachcloud-common/src/main/resources/mapper/SysUserMapper.xml

@@ -46,16 +46,12 @@
             a.remark,
             a.org_id orgId,
             a.code code,
-            c.marker_status as markerStatus,
-            c.marker_leader_status as markerLeaderStatus,
             b.name orgName,
             a.allow_manual_card allowManualCard
         FROM
             sys_user a
                 left join
             sys_org b on a.org_id = b.id
-                LEFT JOIN
-            cloud_user_push_status c on a.school_id = c.school_id and a.id = c.user_id
         <where>
             <if test="schoolId != null and schoolId != ''">
                 and a.school_id = #{schoolId}
@@ -338,24 +334,20 @@
     </select>
     <select id="listExportData" resultType="com.qmth.teachcloud.common.bean.dto.UserExportDto">
         SELECT
-        a.id,
-        a.school_id schoolId,
-        a.login_name loginName,
-        a.real_name realName,
-        a.mobile_number mobileNumber,
-        a.enable,
-        a.remark,
-        a.org_id orgId,
-        a.code code,
-        c.marker_status as markerStatus,
-        c.marker_leader_status as markerLeaderStatus,
-        b.name orgName
+            a.id,
+            a.school_id schoolId,
+            a.login_name loginName,
+            a.real_name realName,
+            a.mobile_number mobileNumber,
+            a.enable,
+            a.remark,
+            a.org_id orgId,
+            a.code code,
+            b.name orgName
         FROM
         sys_user a
         left join
         sys_org b on a.org_id = b.id
-        LEFT JOIN
-        cloud_user_push_status c on a.school_id = c.school_id and a.id = c.user_id
         <where>
             <if test="schoolId != null and schoolId != ''">
                 and a.school_id = #{schoolId}
@@ -453,24 +445,6 @@
         order by
             su.login_name
     </select>
-    <select id="findByRoleTypeAndOrgId" resultType="com.qmth.teachcloud.common.bean.dto.UserRoleDto">
-        SELECT
-            su.id userId,
-            su.login_name loginName,
-            su.real_name realName,
-            sr.id roleId,
-            sr.name roleName
-        FROM
-            sys_user su
-                JOIN
-            sys_user_role sur ON su.id = sur.user_id
-                JOIN
-            sys_role sr ON sur.role_id = sr.id
-        WHERE
-            su.org_id = #{orgId}
-          AND sr.type = #{roleType}
-    </select>
-
     <select id="findCourseSysUserResultByTeachIdSet" resultType="com.qmth.teachcloud.common.bean.result.SysUserResult">
         select
         su.id as id,

teachcloud-report-business/src/main/resources/mapper/ExamDetailCoursePaperTypeMapper.xml

@@ -1,4 +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.ExamDetailCoursePaperTypeMapper">
-</mapper>