fix:合并3.3.4

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

@@ -1,163 +0,0 @@
-package com.qmth.distributed.print.business.entity;
-
-import com.baomidou.mybatisplus.annotation.FieldStrategy;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.distributed.print.business.enums.CourseDimensionSourceEnum;
-import com.qmth.teachcloud.common.base.BaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * <p>
- * 课程知识点表
- * </p>
- *
- * @author CaoZixuan
- * @since 2024-02-27
- */
-@ApiModel(value="CourseDimension对象", description="课程知识点表")
-public class CourseDimension extends BaseEntity {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "教学课程id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long teachCourseId;
-
-    @ApiModelProperty(value = "学校id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long schoolId;
-
-    @ApiModelProperty(value = "学期id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long semesterId;
-
-    @ApiModelProperty(value = "考试id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long examId;
-
-    @ApiModelProperty(value = "课程ID")
-    @JsonSerialize(using = ToStringSerializer.class)
-    @TableField(value = "course_id", updateStrategy = FieldStrategy.IGNORED)
-    private Long courseId;
-    @ApiModelProperty(value = "课程编号")
-    private String courseCode;
-
-    @ApiModelProperty(value = "教师id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long userId;
-
-    @ApiModelProperty(value = "来源")
-    private CourseDimensionSourceEnum source;
-
-    @ApiModelProperty(value = "知识点编号")
-    private String code;
-
-    @ApiModelProperty(value = "知识点名称")
-    private String name;
-
-    @ApiModelProperty(value = "排序")
-    private Integer number;
-
-    @ApiModelProperty(value = "父id（顶级知识点父id为0）")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long parentId;
-
-    public Long getTeachCourseId() {
-        return teachCourseId;
-    }
-
-    public void setTeachCourseId(Long teachCourseId) {
-        this.teachCourseId = teachCourseId;
-    }
-
-    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 getCourseId() {
-        return courseId;
-    }
-
-    public void setCourseId(Long courseId) {
-        this.courseId = courseId;
-    }
-
-    public String getCourseCode() {
-        return courseCode;
-    }
-
-    public void setCourseCode(String courseCode) {
-        this.courseCode = courseCode;
-    }
-
-    public Long getUserId() {
-        return userId;
-    }
-
-    public void setUserId(Long userId) {
-        this.userId = userId;
-    }
-
-    public CourseDimensionSourceEnum getSource() {
-        return source;
-    }
-
-    public void setSource(CourseDimensionSourceEnum source) {
-        this.source = source;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public void setCode(String code) {
-        this.code = code;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Integer getNumber() {
-        return number;
-    }
-
-    public void setNumber(Integer number) {
-        this.number = number;
-    }
-
-    public Long getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(Long parentId) {
-        this.parentId = parentId;
-    }
-}

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

@@ -1,127 +0,0 @@
-package com.qmth.distributed.print.business.entity;
-
-import com.baomidou.mybatisplus.annotation.FieldStrategy;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.distributed.print.business.enums.CourseEvaluationTypeEnum;
-import com.qmth.teachcloud.common.base.BaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * <p>
- * 课程评价方式
- * </p>
- *
- * @author CaoZixuan
- * @since 2024-02-22
- */
-@ApiModel(value="CourseEvaluation对象", description="课程评价方式")
-public class CourseEvaluation extends BaseEntity {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "教学课程id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long teachCourseId;
-
-    @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)
-    @TableField(value = "course_id", updateStrategy = FieldStrategy.IGNORED)
-    private Long courseId;
-    @ApiModelProperty(value = "课程编号")
-    private String courseCode;
-
-    @ApiModelProperty(value = "教师id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long userId;
-
-    @ApiModelProperty(value = "类型（默认DEFAULT、自定义CUSTOM）")
-    private CourseEvaluationTypeEnum type;
-
-    @ApiModelProperty(value = "评价方式")
-    private String evaluation;
-
-    @ApiModelProperty(value = "评价方式描述")
-    private String evaluationDesc;
-
-    public Long getTeachCourseId() {
-        return teachCourseId;
-    }
-
-    public void setTeachCourseId(Long teachCourseId) {
-        this.teachCourseId = teachCourseId;
-    }
-
-    public Long getSchoolId() {
-        return schoolId;
-    }
-
-    public void setSchoolId(Long schoolId) {
-        this.schoolId = schoolId;
-    }
-
-    public Long getExamId() {
-        return examId;
-    }
-
-    public void setExamId(Long examId) {
-        this.examId = examId;
-    }
-
-    public Long getCourseId() {
-        return courseId;
-    }
-
-    public void setCourseId(Long courseId) {
-        this.courseId = courseId;
-    }
-
-    public String getCourseCode() {
-        return courseCode;
-    }
-
-    public void setCourseCode(String courseCode) {
-        this.courseCode = courseCode;
-    }
-
-    public Long getUserId() {
-        return userId;
-    }
-
-    public void setUserId(Long userId) {
-        this.userId = userId;
-    }
-
-    public CourseEvaluationTypeEnum getType() {
-        return type;
-    }
-
-    public void setType(CourseEvaluationTypeEnum type) {
-        this.type = type;
-    }
-
-    public String getEvaluation() {
-        return evaluation;
-    }
-
-    public void setEvaluation(String evaluation) {
-        this.evaluation = evaluation;
-    }
-
-    public String getEvaluationDesc() {
-        return evaluationDesc;
-    }
-
-    public void setEvaluationDesc(String evaluationDesc) {
-        this.evaluationDesc = evaluationDesc;
-    }
-}

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

@@ -1,139 +0,0 @@
-package com.qmth.distributed.print.business.entity;
-
-import com.baomidou.mybatisplus.annotation.FieldStrategy;
-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 io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.math.BigDecimal;
-
-/**
- * <p>
- * 课程目标表
- * </p>
- *
- * @author CaoZixuan
- * @since 2024-02-22
- */
-@ApiModel(value="CourseTarget对象", description="课程目标表")
-public class CourseTarget extends BaseEntity {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "教学课程id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long teachCourseId;
-
-    @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)
-    @TableField(value = "course_id", updateStrategy = FieldStrategy.IGNORED)
-    private Long courseId;
-    @ApiModelProperty(value = "课程编号")
-    private String courseCode;
-
-    @ApiModelProperty(value = "教师id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long userId;
-
-    @ApiModelProperty(value = "课程目标")
-    private String targetName;
-
-    @ApiModelProperty(value = "毕业要求指标")
-    private String targetContent;
-
-    @ApiModelProperty(value = "毕业要求")
-    private String degreeRequirement;
-
-    @ApiModelProperty(value = "课程目标整体权重")
-    private BigDecimal totalWeight;
-
-    public Long getTeachCourseId() {
-        return teachCourseId;
-    }
-
-    public void setTeachCourseId(Long teachCourseId) {
-        this.teachCourseId = teachCourseId;
-    }
-
-    public Long getSchoolId() {
-        return schoolId;
-    }
-
-    public void setSchoolId(Long schoolId) {
-        this.schoolId = schoolId;
-    }
-
-    public Long getExamId() {
-        return examId;
-    }
-
-    public void setExamId(Long examId) {
-        this.examId = examId;
-    }
-
-    public Long getCourseId() {
-        return courseId;
-    }
-
-    public void setCourseId(Long courseId) {
-        this.courseId = courseId;
-    }
-
-    public String getCourseCode() {
-        return courseCode;
-    }
-
-    public void setCourseCode(String courseCode) {
-        this.courseCode = courseCode;
-    }
-
-    public Long getUserId() {
-        return userId;
-    }
-
-    public void setUserId(Long userId) {
-        this.userId = userId;
-    }
-
-    public String getTargetName() {
-        return targetName;
-    }
-
-    public void setTargetName(String targetName) {
-        this.targetName = targetName;
-    }
-
-    public String getTargetContent() {
-        return targetContent;
-    }
-
-    public void setTargetContent(String targetContent) {
-        this.targetContent = targetContent;
-    }
-
-    public String getDegreeRequirement() {
-        return degreeRequirement;
-    }
-
-    public void setDegreeRequirement(String degreeRequirement) {
-        this.degreeRequirement = degreeRequirement;
-    }
-
-    public BigDecimal getTotalWeight() {
-        return totalWeight;
-    }
-
-    public void setTotalWeight(BigDecimal totalWeight) {
-        this.totalWeight = totalWeight;
-    }
-}

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

@@ -1,148 +0,0 @@
-package com.qmth.distributed.print.business.entity;
-
-import com.baomidou.mybatisplus.annotation.FieldStrategy;
-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 io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.math.BigDecimal;
-
-/**
- * <p>
- * 课程权重设置
- * </p>
- *
- * @author CaoZixuan
- * @since 2024-02-22
- */
-@ApiModel(value="CourseWeight对象", description="课程权重设置")
-public class CourseWeight extends BaseEntity {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "教学课程id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long teachCourseId;
-
-    @ApiModelProperty(value = "学校id")
-    private Long schoolId;
-
-    @ApiModelProperty(value = "考试id")
-    private Long examId;
-    @ApiModelProperty(value = "课程ID")
-    @JsonSerialize(using = ToStringSerializer.class)
-    @TableField(value = "course_id", updateStrategy = FieldStrategy.IGNORED)
-    private Long courseId;
-    @ApiModelProperty(value = "课程编号")
-    private String courseCode;
-
-    @ApiModelProperty(value = "教师id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long userId;
-
-    @ApiModelProperty(value = "课程目标表id")
-    private Long targetId;
-
-    @ApiModelProperty(value = "课程评价表id")
-    private Long evaluationId;
-
-    @ApiModelProperty(value = "使用状态 1:使用 0:未使用")
-    private Boolean enable;
-
-    @ApiModelProperty(value = "权重")
-    private BigDecimal weight;
-
-    @ApiModelProperty(value = "目标分值")
-    private BigDecimal targetScore;
-
-    public Long getTeachCourseId() {
-        return teachCourseId;
-    }
-
-    public void setTeachCourseId(Long teachCourseId) {
-        this.teachCourseId = teachCourseId;
-    }
-
-    public Long getSchoolId() {
-        return schoolId;
-    }
-
-    public void setSchoolId(Long schoolId) {
-        this.schoolId = schoolId;
-    }
-
-    public Long getExamId() {
-        return examId;
-    }
-
-    public void setExamId(Long examId) {
-        this.examId = examId;
-    }
-
-    public Long getCourseId() {
-        return courseId;
-    }
-
-    public void setCourseId(Long courseId) {
-        this.courseId = courseId;
-    }
-
-    public String getCourseCode() {
-        return courseCode;
-    }
-
-    public void setCourseCode(String courseCode) {
-        this.courseCode = courseCode;
-    }
-
-    public Long getUserId() {
-        return userId;
-    }
-
-    public void setUserId(Long userId) {
-        this.userId = userId;
-    }
-
-    public Long getTargetId() {
-        return targetId;
-    }
-
-    public void setTargetId(Long targetId) {
-        this.targetId = targetId;
-    }
-
-    public Long getEvaluationId() {
-        return evaluationId;
-    }
-
-    public void setEvaluationId(Long evaluationId) {
-        this.evaluationId = evaluationId;
-    }
-
-    public Boolean getEnable() {
-        return enable;
-    }
-
-    public void setEnable(Boolean enable) {
-        this.enable = enable;
-    }
-
-    public BigDecimal getWeight() {
-        return weight;
-    }
-
-    public void setWeight(BigDecimal weight) {
-        this.weight = weight;
-    }
-
-    public BigDecimal getTargetScore() {
-        return targetScore;
-    }
-
-    public void setTargetScore(BigDecimal targetScore) {
-        this.targetScore = targetScore;
-    }
-}

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

@@ -1,16 +0,0 @@
-package com.qmth.distributed.print.business.mapper;
-
-import com.qmth.distributed.print.business.entity.CourseDimension;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 课程知识点表 Mapper 接口
- * </p>
- *
- * @author CaoZixuan
- * @since 2024-02-27
- */
-public interface CourseDimensionMapper extends BaseMapper<CourseDimension> {
-
-}

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

@@ -1,27 +0,0 @@
-package com.qmth.distributed.print.business.mapper;
-
-import com.qmth.distributed.print.business.bean.result.CourseEvaluationResult;
-import com.qmth.distributed.print.business.entity.CourseEvaluation;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- * 课程评价方式 Mapper 接口
- * </p>
- *
- * @author CaoZixuan
- * @since 2024-02-22
- */
-public interface CourseEvaluationMapper extends BaseMapper<CourseEvaluation> {
-
-    /**
-     * 查询课程评价方式集合
-     *
-     * @param teachCourseId 教学课程id
-     * @return 课程评价方式列表
-     */
-    List<CourseEvaluationResult> findCourseEvaluationList(@Param("teachCourseId") Long teachCourseId);
-}

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

@@ -1,16 +0,0 @@
-package com.qmth.distributed.print.business.mapper;
-
-import com.qmth.distributed.print.business.entity.CourseTarget;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 课程目标表 Mapper 接口
- * </p>
- *
- * @author CaoZixuan
- * @since 2024-02-22
- */
-public interface CourseTargetMapper extends BaseMapper<CourseTarget> {
-
-}

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

@@ -1,26 +0,0 @@
-package com.qmth.distributed.print.business.mapper;
-
-import com.qmth.distributed.print.business.bean.dto.CourseWeightFormDto;
-import com.qmth.distributed.print.business.entity.CourseWeight;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- * 课程权重设置 Mapper 接口
- * </p>
- *
- * @author CaoZixuan
- * @since 2024-02-22
- */
-public interface CourseWeightMapper extends BaseMapper<CourseWeight> {
-
-    /**
-     * 获取权重表单
-     * @param teachCourseId 教学课程id
-     * @return 表单
-     */
-    List<CourseWeightFormDto> findCourseWeightForm(@Param("teachCourseId") Long teachCourseId);
-}

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

@@ -1,35 +0,0 @@
-package com.qmth.distributed.print.business.service;
-
-import com.qmth.distributed.print.business.entity.CourseDimension;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.qmth.teachcloud.common.entity.SysUser;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.io.IOException;
-
-/**
- * <p>
- * 课程知识点表 服务类
- * </p>
- *
- * @author CaoZixuan
- * @since 2024-02-27
- */
-public interface CourseDimensionService extends IService<CourseDimension> {
-
-    /**
-     * 导入课程知识点
-     *
-     * @param requestUser   请求人
-     * @param file          知识点excel
-     * @param teachCourseId 教学课程id
-     */
-    void importCourseDimension(SysUser requestUser, MultipartFile file, Long teachCourseId) throws Exception;
-
-    /**
-     * 同步题库课程知识点属性
-     *
-     * @param teachCourseId 教学课程id
-     */
-    void syncTikuCourseProperties(Long teachCourseId);
-}

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

@@ -1,49 +0,0 @@
-package com.qmth.distributed.print.business.service;
-
-import com.qmth.distributed.print.business.bean.params.CourseEvaluationParam;
-import com.qmth.distributed.print.business.bean.result.CourseEvaluationResult;
-import com.qmth.distributed.print.business.entity.CourseEvaluation;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.qmth.teachcloud.common.entity.SysUser;
-
-import java.util.List;
-
-/**
- * <p>
- * 课程评价方式 服务类
- * </p>
- *
- * @author CaoZixuan
- * @since 2024-02-22
- */
-public interface CourseEvaluationService extends IService<CourseEvaluation> {
-
-    /**
-     * 查询课程评价方式集合
-     *
-     * @param teachCourseId 教学课程id
-     * @return 课程评价方式结果
-     */
-    List<CourseEvaluationResult> findCourseEvaluationList(Long teachCourseId);
-
-    /**
-     * 保存课程评价方式
-     *
-     * @param courseEvaluationParam 课程评价方式参数
-     */
-    void saveCourseEvaluation(CourseEvaluationParam courseEvaluationParam);
-
-    /**
-     * 删除课程评价方式
-     *
-     * @param id 课程评价方式id
-     */
-    void deleteCourseEvaluation(Long id);
-
-    /**
-     * 创建默认的评价方式
-     *
-     * @param teachCourseId 教学课程id
-     */
-    void createDefaultCourseEvaluation(Long teachCourseId);
-}

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

@@ -1,62 +0,0 @@
-package com.qmth.distributed.print.business.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.qmth.distributed.print.business.bean.params.CourseTargetParam;
-import com.qmth.distributed.print.business.bean.result.CourseDimensionTree;
-import com.qmth.distributed.print.business.bean.result.CourseTargetResult;
-import com.qmth.distributed.print.business.bean.result.report.PaperStructDimensionResult;
-import com.qmth.distributed.print.business.entity.CourseTarget;
-import com.qmth.teachcloud.common.entity.SysUser;
-
-import java.util.List;
-
-/**
- * <p>
- * 课程目标表 服务类
- * </p>
- *
- * @author CaoZixuan
- * @since 2024-02-22
- */
-public interface CourseTargetService extends IService<CourseTarget> {
-
-    /**
-     * 查询课程目标集合
-     *
-     * @param teachCourseId 教学课程id
-     * @return 目标集合
-     */
-    List<CourseTargetResult> findCourseTargetList(Long teachCourseId);
-
-    /**
-     * 查询知识点树
-     *
-     * @param teachCourseId 教学课程id
-     * @return 课程知识点树
-     */
-    List<CourseDimensionTree> findDimensionTree(Long teachCourseId);
-
-    /**
-     * 保存课程目标
-     *
-     * @param courseTargetParam 课程目标参数
-     * @param requestUser       请求人
-     */
-    void saveCourseTarget(CourseTargetParam courseTargetParam, SysUser requestUser);
-
-    /**
-     * 删除课程目标
-     *
-     * @param id 课程目标id
-     */
-    void deleteCourseTarget(Long id);
-
-    /**
-     * 查询题库试卷结构（知识点）
-     *
-     * @param teachCourseId 教学课程id
-     * @param paperNumber   试卷编号
-     * @return 试卷结构
-     */
-    List<PaperStructDimensionResult> findTikuPaperStruct(Long teachCourseId, String paperNumber);
-}

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

@@ -1,60 +0,0 @@
-package com.qmth.distributed.print.business.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.qmth.distributed.print.business.bean.dto.CourseWeightFormDto;
-import com.qmth.distributed.print.business.bean.params.CourseWeightParam;
-import com.qmth.distributed.print.business.bean.result.CourseWeightResult;
-import com.qmth.distributed.print.business.entity.CourseWeight;
-import com.qmth.teachcloud.common.entity.SysUser;
-
-import java.util.List;
-
-/**
- * <p>
- * 课程权重设置 服务类
- * </p>
- *
- * @author CaoZixuan
- * @since 2024-02-22
- */
-public interface CourseWeightService extends IService<CourseWeight> {
-
-    /**
-     * 查询课程权重
-     *
-     * @param teachCourseId 教学课程id
-     * @return 课程权重信息
-     */
-    CourseWeightResult findCourseWeight(Long teachCourseId);
-
-    /**
-     * 查询课程权重(report)
-     *
-     * @param teachCourseId 教学课程id
-     * @return 课程权重信息
-     */
-    CourseWeightResult findCourseWeightReport(Long teachCourseId);
-
-    /**
-     * 保存课程权重
-     *
-     * @param courseWeightParam 课程权重参数
-     * @param requestUser       请求人
-     */
-    void saveCourseWeight(CourseWeightParam courseWeightParam, SysUser requestUser);
-
-    /**
-     * 删除课程权重设置
-     *
-     * @param teachCourseId 教学课程id
-     */
-    void deleteCourseWeight(Long teachCourseId);
-
-    /**
-     * 获取课程权重表单数据
-     *
-     * @param teachCourseId 教学课程id
-     * @return 课程权重表单平铺数据
-     */
-    List<CourseWeightFormDto> findCourseWeightForm(Long teachCourseId);
-}

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

@@ -4,11 +4,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.qmth.distributed.print.business.bean.params.TeachCourseSelectParam;
 import com.qmth.distributed.print.business.bean.result.CourseResult;
-import com.qmth.distributed.print.business.bean.result.CourseWeightSettingStatusResult;
-import com.qmth.teachcloud.common.bean.result.DictionaryResult;
 import com.qmth.distributed.print.business.bean.result.TeachCourseResult;
 import com.qmth.distributed.print.business.entity.TeachCourse;
-import com.qmth.distributed.print.business.enums.CourseSettingTypeEnum;
+import com.qmth.teachcloud.common.bean.result.DictionaryResult;
 import com.qmth.teachcloud.common.entity.BasicCourse;
 import com.qmth.teachcloud.common.entity.BasicExamStudent;
 import com.qmth.teachcloud.common.entity.SysUser;
@@ -65,22 +63,6 @@ public interface TeachCourseService extends IService<TeachCourse> {
      */
     TeachCourse findByExamIdCourseIdAndUserId(Long examId, Long courseId, Long userId);
 
-    /**
-     * 清除课程目标、评价、权重设置
-     *
-     * @param teachCourseId         教学课程id
-     * @param courseSettingTypeEnum 课程设置类型
-     */
-    void clearCourseSetting(Long teachCourseId, CourseSettingTypeEnum courseSettingTypeEnum);
-
-    /**
-     * 查询课程权重设置状态
-     *
-     * @param teachCourseId 教学课程id
-     * @return 课程权重设置状态
-     */
-    CourseWeightSettingStatusResult findCourseWeightSettingStatus(Long teachCourseId);
-
     /**
      * 查询教师绑定课程关系
      *
@@ -94,4 +76,4 @@ public interface TeachCourseService extends IService<TeachCourse> {
     List<BasicCourse> listByUserId(Long userId);
 
     void batchCreateTeachCourse(Long schoolId, Long examId, List<BasicExamStudent> basicExamStudentList);
-}
+}

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

@@ -1,267 +0,0 @@
-package com.qmth.distributed.print.business.service.impl;
-
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qmth.distributed.print.business.bean.dto.CourseDimensionImportDto;
-import com.qmth.distributed.print.business.bean.dto.CourseDimensionMd5Dto;
-import com.qmth.distributed.print.business.entity.CourseDimension;
-import com.qmth.distributed.print.business.entity.TeachCourse;
-import com.qmth.distributed.print.business.enums.CourseDimensionCodeEnum;
-import com.qmth.distributed.print.business.enums.CourseDimensionSourceEnum;
-import com.qmth.distributed.print.business.enums.CourseSettingTypeEnum;
-import com.qmth.distributed.print.business.mapper.CourseDimensionMapper;
-import com.qmth.distributed.print.business.service.BasicExamService;
-import com.qmth.distributed.print.business.service.CourseDimensionService;
-import com.qmth.distributed.print.business.service.TeachCourseService;
-import com.qmth.teachcloud.common.bean.result.ExcelResult;
-import com.qmth.teachcloud.common.bean.tiku.TikuCourseProperty;
-import com.qmth.teachcloud.common.contant.SystemConstant;
-import com.qmth.teachcloud.common.entity.BasicCourse;
-import com.qmth.teachcloud.common.entity.BasicExam;
-import com.qmth.teachcloud.common.entity.SysUser;
-import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
-import com.qmth.teachcloud.common.kit.TikuUtils;
-import com.qmth.teachcloud.common.service.BasicCourseService;
-import com.qmth.teachcloud.common.util.ConvertUtil;
-import com.qmth.teachcloud.common.util.ServletUtil;
-import org.apache.commons.codec.digest.DigestUtils;
-import org.apache.commons.collections4.CollectionUtils;
-import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.annotation.Resource;
-import java.util.*;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-/**
- * <p>
- * 课程知识点表 服务实现类
- * </p>
- *
- * @author CaoZixuan
- * @since 2024-02-27
- */
-@Service
-public class CourseDimensionServiceImpl extends ServiceImpl<CourseDimensionMapper, CourseDimension> implements CourseDimensionService {
-
-    @Resource
-    private TeachCourseService teachCourseService;
-    @Resource
-    private BasicExamService basicExamService;
-    @Resource
-    private BasicCourseService basicCourseService;
-    @Resource
-    private TikuUtils tikuUtils;
-
-    @Transactional
-    @Override
-    public void importCourseDimension(SysUser requestUser, MultipartFile file, Long teachCourseId) throws Exception {
-        Long requestUserId = requestUser.getId();
-        Long schoolId = requestUser.getSchoolId();
-
-        TeachCourse teachCourse = teachCourseService.getById(teachCourseId);
-        if (Objects.isNull(teachCourse)) {
-            throw ExceptionResultEnum.ERROR.exception("教学课程不存在");
-        }
-        Long examId = teachCourse.getExamId();
-
-        BasicExam basicExam = basicExamService.getById(examId);
-        if (Objects.isNull(basicExam)) {
-            throw ExceptionResultEnum.ERROR.exception("考试不存在");
-        }
-        Long semesterId = SystemConstant.convertIdToLong(basicExam.getSemesterId());
-
-        ExcelResult<CourseDimensionImportDto> excelResult = ConvertUtil.analyzeExcel(file.getInputStream(),
-                CourseDimensionImportDto.class, false, 1);
-        List<CourseDimensionImportDto> courseDimensionImportDtoList = excelResult.getDatasource();
-        boolean success = excelResult.isSuccess();
-        if (!success) {
-            throw ExceptionResultEnum.ERROR.exception(excelResult.getErrorMsg());
-        }
-
-        // 处理要新增的考察点
-        Map<String, List<String>> dimensionMap = new LinkedHashMap<>();
-        for (CourseDimensionImportDto courseDimensionImportDto : courseDimensionImportDtoList) {
-            String firstDimensionName = courseDimensionImportDto.getFirstDimensionName();
-            if (!SystemConstant.strNotNull(firstDimensionName)) {
-                throw ExceptionResultEnum.ERROR.exception("excel中存在没有填写的一级知识点");
-            }
-            String secondDimensionName = courseDimensionImportDto.getSecondDimensionName();
-
-            if (dimensionMap.containsKey(firstDimensionName)) {
-                if (SystemConstant.strNotNull(secondDimensionName)) {
-                    List<String> sl = dimensionMap.get(firstDimensionName);
-                    if (!sl.contains(secondDimensionName)) {
-                        sl.add(secondDimensionName);
-                        dimensionMap.put(firstDimensionName, sl);
-                    }
-                }
-            } else {
-                List<String> sl = new ArrayList<>();
-                if (SystemConstant.strNotNull(secondDimensionName)) {
-                    sl.add(secondDimensionName);
-                }
-                dimensionMap.put(firstDimensionName, sl);
-            }
-        }
-        CourseDimension temp = new CourseDimension();
-        temp.setTeachCourseId(teachCourseId);
-        temp.setSchoolId(schoolId);
-        temp.setSemesterId(semesterId);
-        temp.setExamId(examId);
-        temp.setCourseId(teachCourse.getCourseId());
-        temp.setUserId(teachCourse.getUserId());
-        temp.setSource(CourseDimensionSourceEnum.IMPORT);
-
-        List<CourseDimension> willSaveDimensions = new ArrayList<>();
-
-        AtomicInteger firstNumber = new AtomicInteger(0);
-        for (String firstDimensionName : dimensionMap.keySet()) {
-            CourseDimension first = new CourseDimension();
-            int index = firstNumber.incrementAndGet();
-            BeanUtils.copyProperties(temp, first);
-            String firstCode = CourseDimensionCodeEnum.getCodeByIndex(index);
-            first.setCode(firstCode);
-            first.setName(firstDimensionName);
-            first.setNumber(index);
-            first.insertInfo(requestUserId);
-            first.setParentId(0L);
-            willSaveDimensions.add(first);
-
-            List<String> secondDimensionList = dimensionMap.get(firstDimensionName);
-            Long firstId = first.getId();
-            for (int i = 0; i < secondDimensionList.size(); i++) {
-                CourseDimension second = new CourseDimension();
-                int secondIndex = i + 1;
-                BeanUtils.copyProperties(temp, second);
-                String secondCode = firstCode + secondIndex;
-                second.setCode(secondCode);
-                second.setName(secondDimensionList.get(i));
-                second.setNumber(secondIndex);
-                second.insertInfo(requestUserId);
-                second.setParentId(firstId);
-                willSaveDimensions.add(second);
-            }
-        }
-        List<CourseDimension> dbList = this.list(
-                new QueryWrapper<CourseDimension>().lambda().eq(CourseDimension::getTeachCourseId, teachCourseId));
-        String dbMd5 = this.buildCourseDimensionMd5(dbList);
-        String willAddMd5 = this.buildCourseDimensionMd5(willSaveDimensions);
-        if (!willAddMd5.equals(dbMd5)) {
-            // 删除课程设置
-            teachCourseService.clearCourseSetting(teachCourseId, CourseSettingTypeEnum.COURSE_DIMENSION);
-            this.saveBatch(willSaveDimensions);
-        }
-    }
-
-    @Transactional
-    @Override
-    public void syncTikuCourseProperties(Long teachCourseId) {
-        SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
-        Long requestUserId = requestUser.getId();
-        TeachCourse teachCourse = teachCourseService.getById(teachCourseId);
-        if (Objects.isNull(teachCourse)) {
-            throw ExceptionResultEnum.ERROR.exception("教学课程不存在");
-        }
-        Long examId = teachCourse.getExamId();
-        BasicCourse basicCourse = basicCourseService.getById(teachCourse.getCourseId());
-        String courseCode = basicCourse.getCode();
-        Long schoolId = teachCourse.getSchoolId();
-        BasicExam basicExam = basicExamService.getById(examId);
-        if (Objects.isNull(basicExam)) {
-            throw ExceptionResultEnum.ERROR.exception("考试不存在");
-        }
-        Long semesterId = SystemConstant.convertIdToLong(basicExam.getSemesterId());
-
-        List<CourseDimension> courseDimensionList = this.list(
-                new QueryWrapper<CourseDimension>().lambda().eq(CourseDimension::getTeachCourseId, teachCourseId));
-
-        if (courseDimensionList.stream().noneMatch(e -> CourseDimensionSourceEnum.IMPORT.equals(e.getSource()))) {
-            // 表里没有导入的知识点记录,从题库获取
-            List<TikuCourseProperty> tikuDimensionList = tikuUtils.listCourseProperty(teachCourse.getSchoolId(),
-                    courseCode);
-            if (CollectionUtils.isNotEmpty(tikuDimensionList)) {
-                CourseDimension temp = new CourseDimension();
-                temp.setTeachCourseId(teachCourseId);
-                temp.setSchoolId(schoolId);
-                temp.setSemesterId(semesterId);
-                temp.setExamId(examId);
-                temp.setCourseCode(courseCode);
-                temp.setUserId(teachCourse.getUserId());
-                temp.setSource(CourseDimensionSourceEnum.UNION_QUESTION);
-                List<CourseDimension> willAddList = new ArrayList<>();
-
-                for (TikuCourseProperty first : tikuDimensionList) {
-                    Long fParentId = first.getParentId();
-                    if (fParentId > 0) {
-                        throw ExceptionResultEnum.ERROR.exception("题库一级知识点父id异常");
-                    }
-                    String fName = first.getName();
-                    String fCode = first.getCode();
-                    int fNumber = Integer.parseInt(first.getNumber());
-
-                    CourseDimension willAddFirst = new CourseDimension();
-                    BeanUtils.copyProperties(temp, willAddFirst);
-                    willAddFirst.setCode(fCode);
-                    willAddFirst.setName(fName);
-                    willAddFirst.setNumber(fNumber);
-                    willAddFirst.insertInfo(requestUserId);
-                    willAddFirst.setParentId(0L);
-                    willAddList.add(willAddFirst);
-
-                    List<TikuCourseProperty> secondList = first.getPropertyList();
-                    for (TikuCourseProperty second : secondList) {
-                        Long sParentId = willAddFirst.getId();
-                        String sName = second.getName();
-                        String sCode = second.getCode();
-                        int sNumber = Integer.parseInt(second.getNumber());
-
-                        CourseDimension willAddSecond = new CourseDimension();
-                        BeanUtils.copyProperties(temp, willAddSecond);
-                        willAddSecond.setCode(sCode);
-                        willAddSecond.setName(sName);
-                        willAddSecond.setNumber(sNumber);
-                        willAddSecond.insertInfo(requestUserId);
-                        willAddSecond.setParentId(sParentId);
-                        willAddList.add(willAddSecond);
-                    }
-                }
-
-                if (CollectionUtils.isNotEmpty(willAddList)) {
-                    String dbMd5 = this.buildCourseDimensionMd5(courseDimensionList.stream().filter(e -> CourseDimensionSourceEnum.UNION_QUESTION.equals(e.getSource()))
-                            .collect(Collectors.toList()));
-                    String willAddMd5 = this.buildCourseDimensionMd5(willAddList);
-                    if (!willAddMd5.equals(dbMd5)) {
-                        // 如果题库知识点和之前的题库知识点不一致，删除原先的并新增
-                        teachCourseService.clearCourseSetting(teachCourseId, CourseSettingTypeEnum.COURSE_DIMENSION);
-                        this.saveBatch(willAddList);
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * 构建知识点md5
-     *
-     * @param courseDimensionList 课程知识点集合
-     * @return MD5
-     */
-    private String buildCourseDimensionMd5(List<CourseDimension> courseDimensionList) {
-        List<CourseDimensionMd5Dto> md5List = courseDimensionList.stream().flatMap(e -> {
-            CourseDimensionMd5Dto dto = new CourseDimensionMd5Dto();
-            dto.setCode(e.getCode());
-            dto.setName(e.getName());
-            dto.setNumber(e.getNumber());
-            dto.setSource(e.getSource());
-            return Stream.of(dto);
-        }).sorted(Comparator.comparing(CourseDimensionMd5Dto::getCode)).collect(Collectors.toList());
-        System.out.println(JSON.toJSONString(md5List));
-        return DigestUtils.md5Hex(JSON.toJSONString(md5List));
-    }
-}

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

@@ -1,148 +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.extension.service.impl.ServiceImpl;
-import com.qmth.distributed.print.business.bean.params.CourseEvaluationParam;
-import com.qmth.distributed.print.business.bean.result.CourseEvaluationResult;
-import com.qmth.distributed.print.business.entity.CourseEvaluation;
-import com.qmth.distributed.print.business.entity.CourseWeight;
-import com.qmth.distributed.print.business.entity.TeachCourse;
-import com.qmth.distributed.print.business.enums.CourseEvaluationTypeEnum;
-import com.qmth.distributed.print.business.enums.CourseSettingTypeEnum;
-import com.qmth.distributed.print.business.mapper.CourseEvaluationMapper;
-import com.qmth.distributed.print.business.service.CourseEvaluationService;
-import com.qmth.distributed.print.business.service.CourseWeightService;
-import com.qmth.distributed.print.business.service.TeachCourseService;
-import com.qmth.teachcloud.common.base.BaseEntity;
-import com.qmth.teachcloud.common.contant.SystemConstant;
-import com.qmth.teachcloud.common.entity.SysUser;
-import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
-import com.qmth.teachcloud.common.util.ServletUtil;
-import org.apache.commons.collections4.CollectionUtils;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
-
-/**
- * <p>
- * 课程评价方式 服务实现类
- * </p>
- *
- * @author CaoZixuan
- * @since 2024-02-22
- */
-@Service
-public class CourseEvaluationServiceImpl extends ServiceImpl<CourseEvaluationMapper, CourseEvaluation> implements CourseEvaluationService {
-
-    @Resource
-    private TeachCourseService teachCourseService;
-    @Resource
-    private CourseWeightService courseWeightService;
-
-    @Override
-    public List<CourseEvaluationResult> findCourseEvaluationList(Long teachCourseId) {
-        TeachCourse teachCourse = teachCourseService.getById(teachCourseId);
-        if (Objects.isNull(teachCourse)) {
-            throw ExceptionResultEnum.ERROR.exception("教学课程不存在");
-        }
-        return this.baseMapper.findCourseEvaluationList(teachCourseId);
-    }
-
-    @Transactional
-    @Override
-    public void saveCourseEvaluation(CourseEvaluationParam courseEvaluationParam) {
-        SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
-
-        Long id = courseEvaluationParam.getId();
-        Long teachCourseId = courseEvaluationParam.getTeachCourseId();
-        String evaluation = courseEvaluationParam.getEvaluation();
-        String evaluationDesc = courseEvaluationParam.getEvaluationDesc();
-        CourseEvaluationTypeEnum type = courseEvaluationParam.getType();
-        TeachCourse teachCourse = teachCourseService.getById(teachCourseId);
-        if (Objects.isNull(teachCourse)) {
-            throw ExceptionResultEnum.ERROR.exception("教学课程不存在");
-        }
-        Long examId = teachCourse.getExamId();
-
-        if (SystemConstant.longNotNull(id)) {
-            // 编辑（只允许更改评价方式描述）
-            CourseEvaluation db = this.getById(id);
-            if (Objects.isNull(db)) {
-                throw ExceptionResultEnum.ERROR.exception("评价方式不存在");
-            }
-            if (!Objects.equals(db.getEvaluationDesc(), evaluationDesc)) {
-                db.updateInfo(requestUser.getId());
-                db.setEvaluationDesc(evaluationDesc);
-                this.updateById(db);
-
-                // 重置权重设置标识
-                teachCourseService.update(new UpdateWrapper<TeachCourse>().lambda().eq(TeachCourse::getId, teachCourseId)
-                        .set(TeachCourse::getWeightSettingSign, SystemConstant.getDbUuid()));
-            }
-        } else {
-            // 新增
-            if (this.count(
-                    new QueryWrapper<CourseEvaluation>().lambda().eq(CourseEvaluation::getTeachCourseId, teachCourseId)
-                            .eq(CourseEvaluation::getEvaluation, evaluation)) > 0) {
-                throw ExceptionResultEnum.ERROR.exception("评价方式重复");
-            }
-            CourseEvaluation courseEvaluation = new CourseEvaluation();
-            courseEvaluation.setTeachCourseId(teachCourseId);
-            courseEvaluation.setSchoolId(teachCourse.getSchoolId());
-            courseEvaluation.setExamId(examId);
-            courseEvaluation.setCourseId(teachCourse.getCourseId());
-            courseEvaluation.setUserId(teachCourse.getUserId());
-            courseEvaluation.setType(type);
-            courseEvaluation.setEvaluation(evaluation);
-            courseEvaluation.setEvaluationDesc(evaluationDesc);
-            courseEvaluation.insertInfo(requestUser.getId());
-            this.save(courseEvaluation);
-        }
-    }
-
-    @Transactional
-    @Override
-    public void deleteCourseEvaluation(Long id) {
-        CourseEvaluation courseEvaluation = this.getById(id);
-        if (Objects.nonNull(courseEvaluation)) {
-            if (CourseEvaluationTypeEnum.DEFAULT.equals(courseEvaluation.getType())) {
-                throw ExceptionResultEnum.ERROR.exception(String.format("[%s]的评价方式不能删除", CourseEvaluationTypeEnum.DEFAULT.getType()));
-            }
-            Long teachCourseId = courseEvaluation.getTeachCourseId();
-
-            // 该评价方式涉及到的权重
-            List<CourseWeight> courseWeightList = courseWeightService.list(
-                    new QueryWrapper<CourseWeight>().lambda().eq(CourseWeight::getTeachCourseId, teachCourseId)
-                            .eq(CourseWeight::getEvaluationId, id));
-
-            if (CollectionUtils.isNotEmpty(courseWeightList)) {
-                if (courseWeightList.stream().anyMatch(CourseWeight::getEnable)) {
-                    // 该评价方式有被用到，删除所有权重设置
-                    teachCourseService.clearCourseSetting(teachCourseId, CourseSettingTypeEnum.COURSE_EVALUATION);
-                } else {
-                    // 该评价方式没有用到，删除权重中涉及该评价方式的记录
-                    teachCourseService.removeByIds(courseWeightList.stream().map(BaseEntity::getId).collect(Collectors.toList()));
-                }
-            }
-            this.removeById(id);
-        }
-    }
-
-    @Transactional
-    @Override
-    public void createDefaultCourseEvaluation(Long teachCourseId) {
-        // 创建默认评价方式
-        CourseEvaluationTypeEnum type = CourseEvaluationTypeEnum.DEFAULT;
-        CourseEvaluationParam courseEvaluationParam = new CourseEvaluationParam();
-        courseEvaluationParam.setTeachCourseId(teachCourseId);
-        courseEvaluationParam.setEvaluation(type.getName());
-        courseEvaluationParam.setEvaluationDesc(type.getValue());
-        courseEvaluationParam.setType(type);
-        this.saveCourseEvaluation(courseEvaluationParam);
-    }
-}

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

@@ -1,414 +0,0 @@
-package com.qmth.distributed.print.business.service.impl;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qmth.distributed.print.business.bean.dto.CourseDimensionDto;
-import com.qmth.distributed.print.business.bean.dto.CourseDimensionOccupiedDto;
-import com.qmth.distributed.print.business.bean.dto.report.CourseTargetWebDto;
-import com.qmth.distributed.print.business.bean.dto.report.DimensionDto;
-import com.qmth.distributed.print.business.bean.params.CourseTargetParam;
-import com.qmth.distributed.print.business.bean.result.CourseDimensionTree;
-import com.qmth.distributed.print.business.bean.result.CourseTargetResult;
-import com.qmth.distributed.print.business.bean.result.report.PaperStructDimensionResult;
-import com.qmth.distributed.print.business.entity.*;
-import com.qmth.distributed.print.business.enums.CourseDimensionSourceEnum;
-import com.qmth.distributed.print.business.enums.CourseSettingTypeEnum;
-import com.qmth.distributed.print.business.mapper.CourseTargetMapper;
-import com.qmth.distributed.print.business.service.*;
-import com.qmth.teachcloud.common.base.BaseEntity;
-import com.qmth.teachcloud.common.contant.SystemConstant;
-import com.qmth.teachcloud.common.entity.SysUser;
-import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
-import org.apache.commons.collections4.CollectionUtils;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
-import java.util.*;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-/**
- * <p>
- * 课程目标表 服务实现类
- * </p>
- *
- * @author CaoZixuan
- * @since 2024-02-22
- */
-@Service
-public class CourseTargetServiceImpl extends ServiceImpl<CourseTargetMapper, CourseTarget> implements CourseTargetService {
-
-    @Resource
-    private TeachCourseService teachCourseService;
-
-    @Resource
-    private CourseDimensionService courseDimensionService;
-
-    @Resource
-    private ExamTaskPaperDataService examTaskPaperDataService;
-
-    @Override
-    public List<CourseTargetResult> findCourseTargetList(Long teachCourseId) {
-        TeachCourse teachCourse = teachCourseService.getById(teachCourseId);
-        if (Objects.isNull(teachCourse)) {
-            throw ExceptionResultEnum.ERROR.exception("教学课程不存在");
-        }
-        List<CourseTarget> courseTargetList = this.list(
-                new QueryWrapper<CourseTarget>().lambda().eq(CourseTarget::getTeachCourseId, teachCourse.getId()).orderByAsc(CourseTarget::getId));
-
-        List<CourseDimension> courseDimensionList = courseDimensionService.list(
-                new QueryWrapper<CourseDimension>().lambda().eq(CourseDimension::getTeachCourseId, teachCourseId));
-
-        Map<Long, CourseDimension> courseDimensionMap = courseDimensionList.stream()
-                .collect(Collectors.toMap(CourseDimension::getId, e -> e));
-
-        return courseTargetList.stream().flatMap(e -> {
-            CourseTargetResult cell = new CourseTargetResult();
-            cell.setId(e.getId());
-            cell.setTargetName(e.getTargetName());
-            cell.setDegreeRequirement(e.getDegreeRequirement());
-            cell.setTotalWeight(e.getTotalWeight());
-            String targetContent = e.getTargetContent();
-            List<Long> dimensionIdList = JSON.parseArray(targetContent, Long.class);
-            List<CourseDimensionDto> dimensionList = new ArrayList<>();
-            if (SystemConstant.strNotNull(targetContent)) {
-                dimensionIdList.forEach(d -> {
-                    CourseDimensionDto courseDimensionDto = new CourseDimensionDto();
-                    CourseDimension courseDimension = courseDimensionMap.get(d);
-                    courseDimensionDto.setId(d);
-                    courseDimensionDto.setCode(courseDimension.getCode());
-                    courseDimensionDto.setName(courseDimension.getName());
-                    dimensionList.add(courseDimensionDto);
-                });
-            }
-            cell.setDimensionList(dimensionList);
-            return Stream.of(cell);
-        }).collect(Collectors.toList());
-    }
-
-    @Override
-    public List<CourseDimensionTree> findDimensionTree(Long teachCourseId) {
-        TeachCourse teachCourse = teachCourseService.getById(teachCourseId);
-        if (Objects.isNull(teachCourse)) {
-            throw ExceptionResultEnum.ERROR.exception("教学课程不存在");
-        }
-
-        // 课程目标
-        List<CourseTarget> courseTargetList = this.list(
-                new QueryWrapper<CourseTarget>().lambda().eq(CourseTarget::getTeachCourseId, teachCourse.getId()));
-
-        // 课程目标id - 该目标包含的所有知识点id集合
-        Map<Long, List<Long>> targetDimensionMap = courseTargetList.stream()
-                .collect(Collectors.toMap(BaseEntity::getId, v -> {
-                    List<Long> dimensionList = new ArrayList<>();
-                    String targetContent = v.getTargetContent();
-                    if (SystemConstant.strNotNull(targetContent)) {
-                        dimensionList = JSON.parseArray(targetContent, Long.class);
-                    }
-                    return dimensionList;
-                }));
-
-        // 课程知识点
-        List<CourseDimension> courseDimensionList = courseDimensionService.list(
-                new QueryWrapper<CourseDimension>().lambda().eq(CourseDimension::getTeachCourseId, teachCourseId));
-
-        List<CourseDimension> firstDimensionList = courseDimensionList.stream().filter(e -> e.getParentId() == 0).sorted(Comparator.comparingInt(CourseDimension::getNumber)).collect(Collectors.toList());
-
-        List<CourseDimensionTree> treeList = new ArrayList<>();
-        for (CourseDimension first : firstDimensionList) {
-            Long id = first.getId();
-            String code = first.getCode();
-            String name = first.getName();
-            CourseDimensionOccupiedDto occupied = this.buildCourseDimensionOccupiedDto(targetDimensionMap, id);
-            List<CourseDimensionTree> children = new ArrayList<>();
-
-            List<CourseDimension> secondDimensionList = courseDimensionList.stream().filter(e -> id.equals(e.getParentId())).sorted(Comparator.comparingInt(CourseDimension::getNumber))
-                    .collect(Collectors.toList());
-            for (CourseDimension child : secondDimensionList) {
-                Long childId = child.getId();
-                String childCode = child.getCode();
-                String childName = child.getName();
-                CourseDimensionOccupiedDto childOccupied = this.buildCourseDimensionOccupiedDto(targetDimensionMap,
-                        childId);
-
-                CourseDimensionTree tree = new CourseDimensionTree(childId, childCode, childName, childOccupied, new ArrayList<>());
-                children.add(tree);
-            }
-            CourseDimensionTree tree = new CourseDimensionTree(id, code, name, occupied, children);
-            treeList.add(tree);
-        }
-        return treeList;
-    }
-
-    @Transactional
-    @Override
-    public void saveCourseTarget(CourseTargetParam courseTargetParam, SysUser requestUser) {
-        Long requestUserId = requestUser.getId();
-        Long id = courseTargetParam.getId();
-        Long teachCourseId = courseTargetParam.getTeachCourseId();
-        TeachCourse teachCourse = teachCourseService.getById(teachCourseId);
-        if (Objects.isNull(teachCourse)) {
-            throw ExceptionResultEnum.ERROR.exception("教学课程不存在");
-        }
-
-        Long examId = teachCourse.getExamId();
-        String targetName = courseTargetParam.getTargetName();
-        String degreeRequirement = courseTargetParam.getDegreeRequirement();
-        List<Long> dimensionIdList = courseTargetParam.getDimensionIdList();
-
-        // 知识点检查
-        Map<Long, CourseDimension> courseDimensionMap = courseDimensionService.list(
-                new QueryWrapper<CourseDimension>().lambda().eq(CourseDimension::getTeachCourseId, teachCourseId)).stream().collect(Collectors.toMap(BaseEntity::getId,
-                v -> v));
-
-        QueryWrapper<CourseTarget> courseTargetQueryWrapper = new QueryWrapper<>();
-        if (Objects.isNull(id)) {
-            courseTargetQueryWrapper.lambda().eq(CourseTarget::getTeachCourseId, teachCourseId);
-        } else {
-            courseTargetQueryWrapper.lambda().ne(CourseTarget::getId, id);
-        }
-        List<CourseTarget> courseTargetResultList = this.list(courseTargetQueryWrapper);
-
-        // 占用的知识点id
-        List<Long> occupiedIdList = courseTargetResultList.stream().flatMap(e -> {
-            List<Long> idList = new ArrayList<>();
-            String content = e.getTargetContent();
-            if (SystemConstant.strNotNull(content)) {
-                idList = JSON.parseArray(content, Long.class);
-            }
-            return idList.stream();
-        }).collect(Collectors.toList());
-        for (Long dimensionId : dimensionIdList) {
-            if (!courseDimensionMap.containsKey(dimensionId)) {
-                throw ExceptionResultEnum.ERROR.exception("知识点不存在");
-            }
-            if (occupiedIdList.contains(dimensionId)) {
-                throw ExceptionResultEnum.ERROR.exception(String.format("知识点[%s]已经被别的课程目标占用",
-                        courseDimensionMap.get(dimensionId).getName() + "(" + courseDimensionMap.get(dimensionId).getCode() + ")"));
-            }
-        }
-
-        CourseTarget checkTargetName = this.getOne(
-                new QueryWrapper<CourseTarget>().lambda().eq(CourseTarget::getTeachCourseId, teachCourseId).eq(CourseTarget::getTargetName, targetName).last(SystemConstant.LIMIT1));
-        if (Objects.nonNull(checkTargetName) && !checkTargetName.getId().equals(id)) {
-            throw ExceptionResultEnum.ERROR.exception("课程目标名称重复");
-        }
-        CourseTarget courseTarget = new CourseTarget();
-        courseTarget.setTeachCourseId(teachCourseId);
-        courseTarget.setSchoolId(requestUser.getSchoolId());
-        courseTarget.setExamId(examId);
-        courseTarget.setCourseId(teachCourse.getCourseId());
-        courseTarget.setUserId(requestUserId);
-        courseTarget.setTargetName(targetName);
-        courseTarget.setDegreeRequirement(degreeRequirement);
-        courseTarget.setTargetContent(JSON.toJSONString(dimensionIdList));
-
-        if (SystemConstant.longNotNull(id)) {
-            // 编辑 (更新教学课程权重标识)
-            UpdateWrapper<TeachCourse> teachCourseUpdateWrapper = new UpdateWrapper<>();
-            teachCourseUpdateWrapper.lambda().eq(TeachCourse::getId, teachCourseId);
-
-            CourseTarget db = this.getById(id);
-            String dbContent = db.getTargetContent();
-            if (SystemConstant.strNotNull(dbContent)) {
-                List<Long> dbDimensionList = JSON.parseArray(dbContent, Long.class);
-                if (!dimensionIdList.containsAll(dbDimensionList) || !dbDimensionList.containsAll(dimensionIdList)) {
-                    // 关联知识点变化 重设知识点，权重md5更新
-                    teachCourseUpdateWrapper.lambda().set(TeachCourse::getDimensionSign, SystemConstant.getDbUuid())
-                            .set(TeachCourse::getWeightSettingSign, SystemConstant.getDbUuid());
-                    teachCourseService.update(teachCourseUpdateWrapper);
-                }
-            }
-            // 目标描述变了 更新权重设置标识
-            if (!courseTarget.getTargetName().equals(db.getTargetName()) || !Objects.equals(courseTarget.getDegreeRequirement(),
-                    db.getDegreeRequirement())) {
-                teachCourseUpdateWrapper.lambda().set(TeachCourse::getWeightSettingSign, SystemConstant.getDbUuid());
-                teachCourseService.update(teachCourseUpdateWrapper);
-            }
-
-            courseTarget.setId(id);
-            courseTarget.updateInfo(requestUserId);
-        } else {
-            // 新增 (清空权重设置)
-            teachCourseService.update(
-                    new UpdateWrapper<TeachCourse>().lambda().eq(TeachCourse::getId, courseTarget.getTeachCourseId()).set(TeachCourse::getDimensionSign, SystemConstant.getDbUuid()));
-            teachCourseService.clearCourseSetting(teachCourseId, CourseSettingTypeEnum.COURSE_TARGET);
-            courseTarget.insertInfo(requestUserId);
-        }
-        this.saveOrUpdate(courseTarget);
-    }
-
-    @Transactional
-    @Override
-    public void deleteCourseTarget(Long id) {
-        CourseTarget courseTarget = this.getById(id);
-        if (Objects.nonNull(courseTarget)) {
-            teachCourseService.update(
-                    new UpdateWrapper<TeachCourse>().lambda().eq(TeachCourse::getId, courseTarget.getTeachCourseId()).set(TeachCourse::getDimensionSign, SystemConstant.getDbUuid()));
-            teachCourseService.clearCourseSetting(courseTarget.getTeachCourseId(), CourseSettingTypeEnum.COURSE_TARGET);
-            this.removeById(id);
-        }
-    }
-
-    @Override
-    public List<PaperStructDimensionResult> findTikuPaperStruct(Long teachCourseId, String paperNumber) {
-        TeachCourse teachCourse = teachCourseService.getById(teachCourseId);
-        if (Objects.isNull(teachCourse)) {
-            throw ExceptionResultEnum.ERROR.exception("教学课程不存在");
-        }
-        List<PaperStructDimensionResult> result = new ArrayList<>();
-
-        List<CourseTarget> courseTargetList = this.list(
-                new QueryWrapper<CourseTarget>().lambda().eq(CourseTarget::getTeachCourseId, teachCourse.getId()));
-        List<CourseDimension> courseDimensionList = courseDimensionService.list(
-                new QueryWrapper<CourseDimension>().lambda().eq(CourseDimension::getTeachCourseId, teachCourse.getId())
-                        .eq(CourseDimension::getSource, CourseDimensionSourceEnum.UNION_QUESTION));
-        Map<String, CourseDimension> courseDimensionMap = courseDimensionList.stream()
-                .collect(Collectors.toMap(CourseDimension::getCode, e -> e));
-
-        ExamTaskPaperData examTaskPaperData = examTaskPaperDataService.getOne(
-                new QueryWrapper<ExamTaskPaperData>().lambda().eq(ExamTaskPaperData::getExamId, teachCourse.getExamId())
-                        .eq(ExamTaskPaperData::getPaperNumber, paperNumber).last(SystemConstant.LIMIT1));
-        if (Objects.nonNull(examTaskPaperData)) {
-            String paperStruct = examTaskPaperData.getPaperJson();
-            if (SystemConstant.strNotNull(paperStruct)) {
-                JSONObject paperStructJson = JSONObject.parseObject(paperStruct);
-                JSONArray detailList = paperStructJson.getJSONArray("details");
-                AtomicInteger mainNumberIndex = new AtomicInteger(1);
-
-                for (int d = 0; d < detailList.size(); d++) {
-                    int mainNumber = mainNumberIndex.getAndIncrement();
-                    JSONObject detail = detailList.getJSONObject(d);
-                    JSONArray questionList = detail.getJSONArray("questions");
-                    AtomicInteger subNumberIndex = new AtomicInteger(1);
-                    for (int q = 0; q < questionList.size(); q++) {
-
-                        JSONObject question = questionList.getJSONObject(q);
-                        JSONArray subQuestionList = question.getJSONArray("subQuestions");
-                        if (CollectionUtils.isNotEmpty(subQuestionList)) {
-                            // 包含套题
-                            for (int s = 0; s < subQuestionList.size(); s++) {
-                                PaperStructDimensionResult subCell = new PaperStructDimensionResult();
-
-                                JSONObject subQuestion = subQuestionList.getJSONObject(s);
-                                Double score = subQuestion.getDouble("score");
-                                String property = subQuestion.getString("property");
-                                if (SystemConstant.strNotNull(property)) {
-                                    List<DimensionDto> dimensionList = JSON.parseArray(property, CourseDimensionDto.class).stream()
-                                            .filter(e -> courseDimensionMap.containsKey(e.getCode())).flatMap(e -> {
-                                                DimensionDto dimensionDto = new DimensionDto();
-                                                dimensionDto.setDimensionId(courseDimensionMap.get(e.getCode()).getId());
-                                                dimensionDto.setDimensionCode(e.getCode());
-                                                dimensionDto.setDimensionName(e.getName());
-                                                return Stream.of(dimensionDto);
-                                            }).collect(Collectors.toList());
-
-                                    List<CourseTargetWebDto> courseTargetResultList = this.buildByDimensionList(
-                                            courseTargetList, dimensionList);
-                                    if (CollectionUtils.isNotEmpty(courseTargetResultList)) {
-                                        subCell.setCourseTargetName(courseTargetResultList.get(0).getTargetName());
-                                    }
-                                    subCell.setTargetList(courseTargetResultList);
-                                }
-                                subCell.setMainNumber(mainNumber);
-                                subCell.setSubNumber(subNumberIndex.getAndIncrement());
-                                subCell.setScore(score);
-                                result.add(subCell);
-                            }
-
-                        } else {
-                            // 不包含套题
-                            PaperStructDimensionResult cell = new PaperStructDimensionResult();
-                            Double score = question.getDouble("score");
-                            String property = question.getString("property");
-                            if (SystemConstant.strNotNull(property)) {
-                                List<DimensionDto> dimensionList = JSON.parseArray(property, CourseDimensionDto.class).stream().filter(e -> courseDimensionMap.containsKey(e.getCode()))
-                                        .flatMap(e -> {
-                                            DimensionDto dimensionDto = new DimensionDto();
-                                            dimensionDto.setDimensionId(courseDimensionMap.get(e.getCode()).getId());
-                                            dimensionDto.setDimensionCode(e.getCode());
-                                            dimensionDto.setDimensionName(e.getName());
-                                            return Stream.of(dimensionDto);
-                                        }).collect(Collectors.toList());
-
-                                List<CourseTargetWebDto> courseTargetResultList = this.buildByDimensionList(
-                                        courseTargetList, dimensionList);
-                                if (CollectionUtils.isNotEmpty(courseTargetResultList)) {
-                                    cell.setCourseTargetName(courseTargetResultList.get(0).getTargetName());
-                                }
-                                cell.setTargetList(courseTargetResultList);
-
-                            }
-                            cell.setMainNumber(mainNumber);
-                            cell.setSubNumber(subNumberIndex.getAndIncrement());
-                            cell.setScore(score);
-                            result.add(cell);
-                        }
-                    }
-                }
-            }
-        }
-        return result;
-    }
-
-    /**
-     * 构建知识点占用情况对象
-     *
-     * @param targetDimensionMap 目标知识点map
-     * @param courseDimensionId  课程知识点id
-     * @return 占用情况
-     */
-    private CourseDimensionOccupiedDto buildCourseDimensionOccupiedDto(Map<Long, List<Long>> targetDimensionMap,
-            Long courseDimensionId) {
-        CourseDimensionOccupiedDto dto = new CourseDimensionOccupiedDto();
-        for (Long targetId : targetDimensionMap.keySet()) {
-            List<Long> dimensionList = targetDimensionMap.get(targetId);
-            if (dimensionList.contains(courseDimensionId)) {
-                dto.setCourseTargetId(targetId);
-                dto.setStatus(true);
-                return dto;
-            }
-        }
-        dto.setStatus(false);
-        return dto;
-    }
-
-    /**
-     * 根据知识点查询对应的课程目标
-     *
-     * @param courseTargetDatasource 课程目标数据源
-     * @param dimensionDtoList       知识点集合
-     * @return 结果
-     */
-    private List<CourseTargetWebDto> buildByDimensionList(List<CourseTarget> courseTargetDatasource,
-            List<DimensionDto> dimensionDtoList) {
-        List<CourseTargetWebDto> result = new ArrayList<>();
-        for (CourseTarget courseTarget : courseTargetDatasource) {
-            Long courseTargetId = courseTarget.getId();
-            String targetName = courseTarget.getTargetName();
-
-            String content = courseTarget.getTargetContent();
-            List<Long> dimensionIdList = JSON.parseArray(content, Long.class);
-            List<DimensionDto> dimensionList = dimensionDtoList.stream().filter(e -> dimensionIdList.contains(e.getDimensionId())).collect(Collectors.toList());
-
-            if (CollectionUtils.isNotEmpty(dimensionList)) {
-                CourseTargetWebDto courseTargetWebDto = new CourseTargetWebDto();
-                courseTargetWebDto.setTargetName(targetName);
-                courseTargetWebDto.setTargetId(courseTargetId);
-                courseTargetWebDto.setDimensionList(dimensionList);
-                result.add(courseTargetWebDto);
-            }
-        }
-        if (result.size() > 1) {
-            // 一个试题只能存在于一个目标下
-            return new ArrayList<>();
-        }
-        return result;
-    }
-}

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

@@ -1,393 +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.extension.service.impl.ServiceImpl;
-import com.qmth.distributed.print.business.bean.dto.CourseDimensionDto;
-import com.qmth.distributed.print.business.bean.dto.CourseWeightDetailDto;
-import com.qmth.distributed.print.business.bean.dto.CourseWeightDto;
-import com.qmth.distributed.print.business.bean.dto.CourseWeightFormDto;
-import com.qmth.distributed.print.business.bean.params.CourseWeightParam;
-import com.qmth.distributed.print.business.bean.result.CourseEvaluationResult;
-import com.qmth.distributed.print.business.bean.result.CourseTargetResult;
-import com.qmth.distributed.print.business.bean.result.CourseWeightResult;
-import com.qmth.distributed.print.business.entity.CourseEvaluation;
-import com.qmth.distributed.print.business.entity.CourseTarget;
-import com.qmth.distributed.print.business.entity.CourseWeight;
-import com.qmth.distributed.print.business.entity.TeachCourse;
-import com.qmth.distributed.print.business.enums.CourseEvaluationTypeEnum;
-import com.qmth.distributed.print.business.enums.CourseSettingTypeEnum;
-import com.qmth.distributed.print.business.mapper.CourseWeightMapper;
-import com.qmth.distributed.print.business.service.CourseEvaluationService;
-import com.qmth.distributed.print.business.service.CourseTargetService;
-import com.qmth.distributed.print.business.service.CourseWeightService;
-import com.qmth.distributed.print.business.service.TeachCourseService;
-import com.qmth.teachcloud.common.contant.SystemConstant;
-import com.qmth.teachcloud.common.entity.SysUser;
-import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
-import org.apache.commons.collections4.CollectionUtils;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.util.*;
-import java.util.stream.Collectors;
-
-/**
- * <p>
- * 课程权重设置 服务实现类
- * </p>
- *
- * @author CaoZixuan
- * @since 2024-02-22
- */
-@Service
-public class CourseWeightServiceImpl extends ServiceImpl<CourseWeightMapper, CourseWeight> implements CourseWeightService {
-
-    @Resource
-    private TeachCourseService teachCourseService;
-
-    @Resource
-    private CourseTargetService courseTargetService;
-
-    @Resource
-    private CourseEvaluationService courseEvaluationService;
-
-    @Override
-    public CourseWeightResult findCourseWeight(Long teachCourseId) {
-        TeachCourse teachCourse = teachCourseService.getById(teachCourseId);
-        if (Objects.isNull(teachCourse)) {
-            throw ExceptionResultEnum.ERROR.exception("教学班不存在");
-        }
-
-        BigDecimal defaultRate = teachCourse.getDefaultRate();
-        BigDecimal customRate = teachCourse.getCustomRate();
-
-        // 现有目标
-        List<CourseTargetResult> courseTargetList = courseTargetService.findCourseTargetList(teachCourseId);
-        // 现有评价方式
-        List<CourseEvaluationResult> courseEvaluationResultList = courseEvaluationService.findCourseEvaluationList(
-                teachCourseId).stream().sorted((o1, o2) -> {
-            if (o1.getType().getIndex() == o2.getType().getIndex()) {
-                return o1.getEvaluationId() < o2.getEvaluationId() ? -1 : 0;
-            } else {
-                return o2.getType().getIndex() - o1.getType().getIndex();
-            }
-        }).collect(Collectors.toList());
-        // 现有权重
-        List<CourseWeight> courseWeightList = this.list(
-                new QueryWrapper<CourseWeight>().lambda().eq(CourseWeight::getTeachCourseId, teachCourseId));
-        // 权重map
-        Map<String, CourseWeight> courseWeightMap = courseWeightList.stream()
-                .collect(Collectors.toMap(k -> k.getTargetId() + SystemConstant.HYPHEN + k.getEvaluationId(), v -> v));
-
-        List<CourseWeightDto> submitForm = new ArrayList<>();
-        if (CollectionUtils.isNotEmpty(courseTargetList)) {
-            for (CourseTargetResult courseTarget : courseTargetList) {
-                Long targetId = courseTarget.getId();
-                String targetName = courseTarget.getTargetName();
-                List<CourseDimensionDto> dimensionList = courseTarget.getDimensionList();
-                String degreeRequirement = courseTarget.getDegreeRequirement();
-                BigDecimal totalWeight = courseTarget.getTotalWeight();
-                BigDecimal totalScore = new BigDecimal(0);
-
-                List<CourseWeightDetailDto> courseWeightDetailDtoList = new ArrayList<>();
-                for (CourseEvaluationResult courseEvaluationResult : courseEvaluationResultList) {
-                    Long evaluationId = courseEvaluationResult.getEvaluationId();
-                    String evaluationName = courseEvaluationResult.getEvaluation();
-                    String key = targetId + SystemConstant.HYPHEN + evaluationId;
-
-                    Boolean enable = false;
-                    BigDecimal weight = BigDecimal.ZERO;
-                    BigDecimal targetScore = BigDecimal.ZERO;
-                    if (courseWeightMap.containsKey(key)) {
-                        // 权重表中包含该目标评价的设置 - 获取权重表的数据
-                        CourseWeight courseWeight = courseWeightMap.get(key);
-                        enable = courseWeight.getEnable();
-                        weight = courseWeight.getWeight();
-                        targetScore = courseWeight.getTargetScore();
-                    } else if (CourseEvaluationTypeEnum.DEFAULT.equals(courseEvaluationResult.getType())) {
-                        enable = true;
-                        weight = new BigDecimal(100);
-                    }
-                    CourseWeightDetailDto detail = new CourseWeightDetailDto();
-                    detail.setEvaluationId(evaluationId);
-                    detail.setEvaluationName(evaluationName);
-                    detail.setEvaluationDesc(courseEvaluationResult.getEvaluationDesc());
-                    detail.setEnable(enable);
-                    detail.setWeight(weight);
-                    detail.setTargetScore(targetScore);
-                    detail.setEvaluationType(courseEvaluationResult.getType());
-                    if (enable) {
-                        totalScore = totalScore.add(targetScore);
-                    }
-                    courseWeightDetailDtoList.add(detail);
-                }
-
-                CourseWeightDto courseWeightDto = new CourseWeightDto();
-                courseWeightDto.setCourseTargetId(targetId);
-                courseWeightDto.setCourseTargetName(targetName);
-                courseWeightDto.setDimensionList(dimensionList);
-                courseWeightDto.analyzeDimensionStr();
-                courseWeightDto.setDegreeRequirement(degreeRequirement);
-                courseWeightDto.setTotalWeight(totalWeight);
-                courseWeightDto.setTotalScore(totalScore);
-                courseWeightDto.setEvaluationList(courseWeightDetailDtoList);
-                courseWeightDto.analyzeDimensionStr();
-                submitForm.add(courseWeightDto);
-            }
-        }
-        CourseWeightResult result = new CourseWeightResult();
-        result.setWeightSettingSign(teachCourse.getWeightSettingSign());
-        result.setDimensionSign(teachCourse.getDimensionSign());
-        result.setDefaultRate(defaultRate);
-        result.setCustomRate(customRate);
-        result.setSubmitForm(submitForm);
-        return result;
-    }
-
-    @Override
-    public CourseWeightResult findCourseWeightReport(Long teachCourseId) {
-        TeachCourse teachCourse = teachCourseService.getById(teachCourseId);
-        if (Objects.isNull(teachCourse)) {
-            throw ExceptionResultEnum.ERROR.exception("教学班不存在");
-        }
-
-        BigDecimal defaultRate = teachCourse.getDefaultRate();
-        BigDecimal customRate = teachCourse.getCustomRate();
-
-        // 现有目标
-        List<CourseTargetResult> courseTargetList = courseTargetService.findCourseTargetList(teachCourseId);
-        // 现有评价方式
-        List<CourseEvaluationResult> courseEvaluationResultList = courseEvaluationService.findCourseEvaluationList(
-                teachCourseId).stream().sorted((o1, o2) -> {
-            if (o1.getType().getIndex() == o2.getType().getIndex()) {
-                return o1.getEvaluationId() < o2.getEvaluationId() ? -1 : 0;
-            } else {
-                return o2.getType().getIndex() - o1.getType().getIndex();
-            }
-        }).collect(Collectors.toList());
-        // 现有权重
-        List<CourseWeight> courseWeightList = this.list(
-                new QueryWrapper<CourseWeight>().lambda().eq(CourseWeight::getTeachCourseId, teachCourseId));
-        // 权重map
-        Map<String, CourseWeight> courseWeightMap = courseWeightList.stream()
-                .collect(Collectors.toMap(k -> k.getTargetId() + SystemConstant.HYPHEN + k.getEvaluationId(), v -> v));
-
-        List<CourseWeightDto> submitForm = new ArrayList<>();
-        if (CollectionUtils.isNotEmpty(courseTargetList)) {
-            for (CourseTargetResult courseTarget : courseTargetList) {
-                Long targetId = courseTarget.getId();
-                String targetName = courseTarget.getTargetName();
-                List<CourseDimensionDto> dimensionList = courseTarget.getDimensionList();
-                String degreeRequirement = courseTarget.getDegreeRequirement();
-                BigDecimal totalWeight = courseTarget.getTotalWeight();
-                BigDecimal totalScore = new BigDecimal(0);
-
-                List<CourseWeightDetailDto> courseWeightDetailDtoList = new ArrayList<>();
-                for (CourseEvaluationResult courseEvaluationResult : courseEvaluationResultList) {
-                    Long evaluationId = courseEvaluationResult.getEvaluationId();
-                    String evaluationName = courseEvaluationResult.getEvaluation();
-                    String key = targetId + SystemConstant.HYPHEN + evaluationId;
-                    Boolean enable;
-                    BigDecimal weight;
-                    BigDecimal targetScore;
-                    if (courseWeightMap.containsKey(key)) {
-                        // 权重表中包含该目标评价的设置 - 获取权重表的数据
-                        CourseWeight courseWeight = courseWeightMap.get(key);
-                        enable = courseWeight.getEnable();
-                        if (enable) {
-                            weight = courseWeight.getWeight();
-                            targetScore = courseWeight.getTargetScore();
-                            CourseWeightDetailDto detail = new CourseWeightDetailDto();
-                            detail.setEvaluationId(evaluationId);
-                            detail.setEvaluationName(evaluationName);
-                            detail.setEvaluationDesc(courseEvaluationResult.getEvaluationDesc());
-                            detail.setEnable(true);
-                            detail.setWeight(weight);
-                            detail.setTargetScore(targetScore);
-                            detail.setEvaluationType(courseEvaluationResult.getType());
-                            totalScore = totalScore.add(targetScore);
-                            courseWeightDetailDtoList.add(detail);
-                        }
-                    }
-                }
-                CourseWeightDto courseWeightDto = new CourseWeightDto();
-                courseWeightDto.setCourseTargetId(targetId);
-                courseWeightDto.setCourseTargetName(targetName);
-                courseWeightDto.setDimensionList(dimensionList);
-                courseWeightDto.analyzeDimensionStr();
-                courseWeightDto.setDegreeRequirement(degreeRequirement);
-                courseWeightDto.setTotalWeight(totalWeight);
-                courseWeightDto.setTotalScore(totalScore);
-                courseWeightDto.setEvaluationList(courseWeightDetailDtoList);
-                courseWeightDto.analyzeDimensionStr();
-                submitForm.add(courseWeightDto);
-            }
-        }
-        CourseWeightResult result = new CourseWeightResult();
-        result.setWeightSettingSign(teachCourse.getWeightSettingSign());
-        result.setDimensionSign(teachCourse.getDimensionSign());
-        result.setDefaultRate(defaultRate);
-        result.setCustomRate(customRate);
-        result.setSubmitForm(submitForm);
-        return result;
-    }
-
-    @Transactional
-    @Override
-    public void saveCourseWeight(CourseWeightParam courseWeightParam, SysUser requestUser) {
-        List<String> errorMsgList = new ArrayList<>();
-        Long requestUserId = requestUser.getId();
-        Long teachCourseId = courseWeightParam.getTeachCourseId();
-        BigDecimal defaultRate = courseWeightParam.getDefaultRate();
-        BigDecimal customRate = courseWeightParam.getCustomRate();
-
-        List<CourseWeightDto> submitForm = courseWeightParam.getSubmitForm();
-
-        TeachCourse teachCourse = teachCourseService.getById(teachCourseId);
-        if (Objects.isNull(teachCourse)) {
-            throw ExceptionResultEnum.ERROR.exception("教学课程不存在");
-        }
-        Long examId = teachCourse.getExamId();
-
-        teachCourseService.clearCourseSetting(teachCourseId, CourseSettingTypeEnum.COURSE_WEIGHT);
-
-        List<CourseTarget> courseTargetList = new ArrayList<>();
-        List<CourseWeight> courseWeightList = new ArrayList<>();
-
-        // 课程目标整体权重检测
-        BigDecimal checkTargetTotalWeight = BigDecimal.ZERO;
-
-        // 一个评价方式必须在一个目标下
-        Map<Long, CourseEvaluationTypeEnum> evaluationMap = new HashMap<>();
-
-        for (CourseWeightDto courseWeightDto : submitForm) {
-            Long courseTargetId = courseWeightDto.getCourseTargetId();
-            CourseTarget courseTarget = courseTargetService.getById(courseTargetId);
-            if (Objects.isNull(courseTarget)) {
-                throw ExceptionResultEnum.ERROR.exception("课程目标不存在");
-            }
-
-            BigDecimal totalWeight = courseWeightDto.getTotalWeight();
-            courseTarget.setTotalWeight(totalWeight);
-            courseTarget.updateInfo(requestUserId);
-            courseTargetList.add(courseTarget);
-            checkTargetTotalWeight = checkTargetTotalWeight.add(totalWeight);
-
-            // 评价方式整体权重检测(自定义)
-            BigDecimal checkEvaluationCustomTotalWeight = BigDecimal.ZERO;
-            List<CourseWeightDetailDto> detailDtoList = courseWeightDto.getEvaluationList();
-            for (CourseWeightDetailDto detail : detailDtoList) {
-                Long evaluationId = detail.getEvaluationId();
-                CourseEvaluation courseEvaluation = courseEvaluationService.getById(evaluationId);
-                BigDecimal rate = new BigDecimal(0);
-                CourseEvaluationTypeEnum evaluationType = courseEvaluation.getType();
-                if (CourseEvaluationTypeEnum.DEFAULT.equals(evaluationType)) {
-                    rate = defaultRate;
-                } else if (CourseEvaluationTypeEnum.CUSTOM.equals(evaluationType)) {
-                    rate = customRate;
-                }
-
-                Boolean enable = detail.getEnable();
-                BigDecimal weight = detail.getWeight();
-                if (enable && CourseEvaluationTypeEnum.CUSTOM.equals(evaluationType)) {
-                    if (evaluationMap.containsKey(evaluationId)) {
-                        throw ExceptionResultEnum.ERROR.exception("评价方式只能被一个课程目标使用");
-                    } else {
-                        evaluationMap.put(evaluationId, evaluationType);
-                    }
-                    checkEvaluationCustomTotalWeight = checkEvaluationCustomTotalWeight.add(weight);
-
-                }
-
-                BigDecimal denominator = new BigDecimal(100);
-                // 目标分值计算: 100 * 类型占比 * 目标占比 * 评价方式占比
-                BigDecimal targetScore = new BigDecimal(0);
-                if (enable) {
-                    targetScore = new BigDecimal(100).multiply(rate).divide(denominator, 2, RoundingMode.HALF_UP)
-                            .multiply(totalWeight).divide(denominator, 2, RoundingMode.HALF_UP).multiply(weight)
-                            .divide(denominator, 2, RoundingMode.HALF_UP);
-                }
-
-                CourseWeight courseWeight = new CourseWeight();
-                courseWeight.setTeachCourseId(teachCourseId);
-                courseWeight.setSchoolId(requestUser.getSchoolId());
-                courseWeight.setExamId(examId);
-                courseWeight.setCourseId(teachCourse.getCourseId());
-                courseWeight.setUserId(requestUserId);
-                courseWeight.setTargetId(courseTargetId);
-                courseWeight.setEvaluationId(evaluationId);
-                courseWeight.setEnable(enable);
-                courseWeight.setWeight(weight);
-                courseWeight.setTargetScore(targetScore);
-                courseWeight.insertInfo(requestUserId);
-                courseWeightList.add(courseWeight);
-            }
-            // 数据校验2:各课程目标下自定义评价方式的总权重应等于100%；
-            int checkEvaluationTotalWeightCompareResult = checkEvaluationCustomTotalWeight.compareTo(new BigDecimal(100));
-            if (checkEvaluationTotalWeightCompareResult > 0) {
-                errorMsgList.add(String.format("课程目标[%s]下评价方式的总权重为[%s],超过[%s]", courseTarget.getTargetName(),
-                        String.valueOf(checkEvaluationCustomTotalWeight) + '%', "100%"));
-            } else if (checkEvaluationTotalWeightCompareResult < 0) {
-                errorMsgList.add(String.format("课程目标[%s]下评价方式的总权重为[%s],低于[%s]", courseTarget.getTargetName(),
-                        String.valueOf(checkEvaluationCustomTotalWeight) + '%', "100%"));
-            }
-        }
-
-        // 数据校验1:默认和自定义的权重合为100；
-        if (defaultRate.add(customRate).compareTo(new BigDecimal(100)) != 0) {
-            errorMsgList.add("平时成绩权重和期末成绩权重之和不为100%");
-        }
-
-        // 数据校验3:目标整体权重应等于100%，用于计算课程整体达成度。
-        int checkTargetTotalWeightCompareResult = checkTargetTotalWeight.compareTo(new BigDecimal(100));
-        if (checkTargetTotalWeightCompareResult > 0) {
-            errorMsgList.add(
-                    String.format("所有课程目标整体权重为[%s],超过[%s]", String.valueOf(checkTargetTotalWeight) + '%', "100%"));
-        } else if (checkTargetTotalWeightCompareResult < 0) {
-            errorMsgList.add(
-                    String.format("所有课程目标整体权重为[%s],低于[%s]", String.valueOf(checkTargetTotalWeight) + '%', "100%"));
-        }
-        if (CollectionUtils.isNotEmpty(errorMsgList)) {
-            throw ExceptionResultEnum.ERROR.exception(String.join(";", errorMsgList));
-        }
-
-        // 更新目标整体权重
-        courseTargetService.updateBatchById(courseTargetList);
-        // 保存课程权重设置
-        this.saveBatch(courseWeightList);
-        // 更新课程权重设置状态
-        teachCourse.setWeightSetting(true);
-        teachCourse.setWeightSettingSign(SystemConstant.getDbUuid());
-        teachCourse.setDefaultRate(defaultRate);
-        teachCourse.setCustomRate(customRate);
-        teachCourseService.updateById(teachCourse);
-    }
-
-    @Transactional
-    @Override
-    public void deleteCourseWeight(Long teachCourseId) {
-        this.remove(new QueryWrapper<CourseWeight>().lambda().eq(CourseWeight::getTeachCourseId, teachCourseId));
-        UpdateWrapper<CourseTarget> courseTargetUpdateWrapper = new UpdateWrapper<>();
-        courseTargetUpdateWrapper.lambda().eq(CourseTarget::getTeachCourseId, teachCourseId)
-                .set(CourseTarget::getTotalWeight, null);
-        courseTargetService.update(courseTargetUpdateWrapper);
-
-        UpdateWrapper<TeachCourse> teachCourseUpdateWrapper = new UpdateWrapper<>();
-        teachCourseUpdateWrapper.lambda().eq(TeachCourse::getId, teachCourseId)
-                .set(TeachCourse::getWeightSettingSign, null).set(TeachCourse::getDefaultRate, null).set(TeachCourse::getCustomRate, null);
-        teachCourseService.update(teachCourseUpdateWrapper);
-    }
-
-    @Override
-    public List<CourseWeightFormDto> findCourseWeightForm(Long teachCourseId) {
-        TeachCourse teachCourse = teachCourseService.getById(teachCourseId);
-        if (Objects.isNull(teachCourse)) {
-            throw ExceptionResultEnum.ERROR.exception("教学课程不存在");
-        }
-        return this.baseMapper.findCourseWeightForm(teachCourseId);
-    }
-}

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

@@ -1,20 +1,21 @@
 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.bean.params.TeachCourseSelectParam;
 import com.qmth.distributed.print.business.bean.result.CourseResult;
-import com.qmth.distributed.print.business.bean.result.CourseWeightSettingStatusResult;
-import com.qmth.teachcloud.common.bean.result.DictionaryResult;
 import com.qmth.distributed.print.business.bean.result.TeachCourseResult;
-import com.qmth.distributed.print.business.entity.*;
-import com.qmth.distributed.print.business.enums.CourseSettingTypeEnum;
+import com.qmth.distributed.print.business.entity.TeachClazz;
+import com.qmth.distributed.print.business.entity.TeachCourse;
+import com.qmth.distributed.print.business.entity.TeachStudent;
 import com.qmth.distributed.print.business.mapper.TeachCourseMapper;
-import com.qmth.distributed.print.business.service.*;
+import com.qmth.distributed.print.business.service.TeachClazzService;
+import com.qmth.distributed.print.business.service.TeachCourseService;
+import com.qmth.distributed.print.business.service.TeachStudentService;
 import com.qmth.teachcloud.common.bean.dto.DataPermissionRule;
+import com.qmth.teachcloud.common.bean.result.DictionaryResult;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.BasicCourse;
 import com.qmth.teachcloud.common.entity.BasicExamStudent;
@@ -43,24 +44,22 @@ public class TeachCourseServiceImpl extends ServiceImpl<TeachCourseMapper, Teach
 
     @Resource
     private BasicCourseService basicCourseService;
+
     @Resource
     private SysOrgService sysOrgService;
+
     @Resource
     private SysUserService sysUserService;
+
     @Resource
     private TeachClazzService teachClazzService;
-    @Resource
-    private CourseTargetService courseTargetService;
-    @Resource
-    private CourseEvaluationService courseEvaluationService;
-    @Resource
-    private CourseWeightService courseWeightService;
-    @Resource
-    private CourseDimensionService courseDimensionService;
+
     @Resource
     private TeachStudentService teachStudentService;
+
     @Resource
     private BasicRoleDataPermissionService basicRoleDataPermissionService;
+
     @Resource
     private TeachcloudCommonService teachcloudCommonService;
 
@@ -79,8 +78,8 @@ public class TeachCourseServiceImpl extends ServiceImpl<TeachCourseMapper, Teach
         Long examId = teachCourseSelectParam.getExamId();
         List<Long> courseIds = teachCourseSelectParam.getCourseIds();
 
-        List<Long> userCourseIds = this.list(
-                        new QueryWrapper<TeachCourse>().lambda().eq(TeachCourse::getExamId, examId).eq(TeachCourse::getUserId, teachCourseSelectParam.getUserId())).stream().map(TeachCourse::getCourseId)
+        List<Long> userCourseIds = this.list(new QueryWrapper<TeachCourse>().lambda().eq(TeachCourse::getExamId, examId)
+                        .eq(TeachCourse::getUserId, teachCourseSelectParam.getUserId())).stream().map(TeachCourse::getCourseId)
                 .collect(Collectors.toList());
 
         List<TeachCourse> teachCourseList = new ArrayList<>();
@@ -101,11 +100,6 @@ public class TeachCourseServiceImpl extends ServiceImpl<TeachCourseMapper, Teach
 
         if (CollectionUtils.isNotEmpty(teachCourseList)) {
             this.saveBatch(teachCourseList);
-
-            for (TeachCourse teachCourse : teachCourseList) {
-                // 创建默认评价方式
-                courseEvaluationService.createDefaultCourseEvaluation(teachCourse.getId());
-            }
         }
     }
 
@@ -132,23 +126,7 @@ public class TeachCourseServiceImpl extends ServiceImpl<TeachCourseMapper, Teach
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void deleteTeachCourseBatch(List<Long> idList) {
-        SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
-        Long requestUserId = requestUser.getId();
-        List<TeachCourse> teachCourseList = this.listByIds(idList);
         for (Long teachCourseId : idList) {
-            // 删除知识点
-            courseDimensionService.remove(
-                    new QueryWrapper<CourseDimension>().lambda().eq(CourseDimension::getTeachCourseId, teachCourseId));
-            // 删除课程目标
-            courseTargetService.remove(
-                    new QueryWrapper<CourseTarget>().lambda().eq(CourseTarget::getTeachCourseId, teachCourseId));
-            // 删除课程评价方式
-            courseEvaluationService.remove(new QueryWrapper<CourseEvaluation>().lambda()
-                    .eq(CourseEvaluation::getTeachCourseId, teachCourseId));
-            // 删除权重设置
-            courseWeightService.remove(
-                    new QueryWrapper<CourseWeight>().lambda().eq(CourseWeight::getTeachCourseId, teachCourseId));
-
             // 删除教学学生
             teachStudentService.remove(
                     new QueryWrapper<TeachStudent>().lambda().eq(TeachStudent::getTeachCourseId, teachCourseId));
@@ -173,50 +151,6 @@ public class TeachCourseServiceImpl extends ServiceImpl<TeachCourseMapper, Teach
         return teachCourse;
     }
 
-    @Transactional
-    @Override
-    public void clearCourseSetting(Long teachCourseId, CourseSettingTypeEnum courseSettingTypeEnum) {
-        if (courseSettingTypeEnum == CourseSettingTypeEnum.COURSE_DIMENSION) {// 删除知识点、目标设置
-            SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
-            Long requestUserId = requestUser.getId();
-
-            courseDimensionService.remove(
-                    new QueryWrapper<CourseDimension>().lambda().eq(CourseDimension::getTeachCourseId, teachCourseId));
-
-            UpdateWrapper<CourseTarget> updateWrapper = new UpdateWrapper<>();
-            updateWrapper.lambda().eq(CourseTarget::getTeachCourseId, teachCourseId)
-                    .set(CourseTarget::getTargetContent, null).set(CourseTarget::getUpdateId, requestUserId)
-                    .set(CourseTarget::getUpdateTime, System.currentTimeMillis());
-            courseTargetService.update(updateWrapper);
-
-            UpdateWrapper<TeachCourse> teachCourseUpdateWrapper = new UpdateWrapper<>();
-            teachCourseUpdateWrapper.lambda().eq(TeachCourse::getId, teachCourseId)
-                    .set(TeachCourse::getWeightSettingSign, SystemConstant.getDbUuid())
-                    .set(TeachCourse::getDimensionSign, SystemConstant.getDbUuid());
-            this.update(teachCourseUpdateWrapper);
-        } else {
-            // 删除权重设置
-            courseWeightService.deleteCourseWeight(teachCourseId);
-        }
-    }
-
-    @Override
-    public CourseWeightSettingStatusResult findCourseWeightSettingStatus(Long teachCourseId) {
-        CourseWeightSettingStatusResult result = new CourseWeightSettingStatusResult();
-        TeachCourse teachCourse = this.getById(teachCourseId);
-        if (Objects.isNull(teachCourse)) {
-            throw ExceptionResultEnum.ERROR.exception("教学课程不存在");
-        }
-        Boolean everSettingStatus = teachCourse.getWeightSetting();
-        Boolean currenSettingStatus = courseWeightService.count(
-                new QueryWrapper<CourseWeight>().lambda().eq(CourseWeight::getTeachCourseId, teachCourseId)) > 0;
-        Long createId = teachCourse.getCreateId();
-        result.setEverSettingStatus(everSettingStatus);
-        result.setCurrentSettingStatus(currenSettingStatus);
-        result.setCourseCreateId(createId);
-        return result;
-    }
-
     @Override
     public List<DictionaryResult> findTeacherCourseInfo(Long userId) {
         SysUser sysUser = sysUserService.getById(userId);
@@ -246,8 +180,8 @@ public class TeachCourseServiceImpl extends ServiceImpl<TeachCourseMapper, Teach
         QueryWrapper<BasicCourse> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().in(BasicCourse::getTeachingRoomId, orgIds).eq(BasicCourse::getEnable, true);
         if (StringUtils.isNotBlank(param)) {
-            queryWrapper.lambda().and(i -> i.like(BasicCourse::getCode, SystemConstant.translateSpecificSign(param))
-                    .or().like(BasicCourse::getName, SystemConstant.translateSpecificSign(param)));
+            queryWrapper.lambda()
+                    .and(i -> i.like(BasicCourse::getCode, SystemConstant.translateSpecificSign(param)).or().like(BasicCourse::getName, SystemConstant.translateSpecificSign(param)));
         }
         List<BasicCourse> basicCourseList = basicCourseService.list(queryWrapper);
         courseResult.setBasicCourseList(basicCourseList);
@@ -260,13 +194,13 @@ public class TeachCourseServiceImpl extends ServiceImpl<TeachCourseMapper, Teach
         QueryWrapper<TeachCourse> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(TeachCourse::getUserId, userId);
         List<TeachCourse> list = this.list(queryWrapper);
-        List<BasicCourse> basicCourseList = list.stream().map(m -> basicCourseService.getById(m.getCourseId())).collect(Collectors.toList());
-        return basicCourseList;
+        return list.stream().map(m -> basicCourseService.getById(m.getCourseId())).collect(Collectors.toList());
     }
 
     @Override
     public void batchCreateTeachCourse(Long schoolId, Long examId, List<BasicExamStudent> basicExamStudentList) {
-        Map<Long, List<BasicExamStudent>> listMap = basicExamStudentList.stream().filter(e -> Objects.nonNull(e.getTeacherId())).collect(Collectors.groupingBy(BasicExamStudent::getTeacherId));
+        Map<Long, List<BasicExamStudent>> listMap = basicExamStudentList.stream().filter(e -> Objects.nonNull(e.getTeacherId()))
+                .collect(Collectors.groupingBy(BasicExamStudent::getTeacherId));
         for (Map.Entry<Long, List<BasicExamStudent>> entry : listMap.entrySet()) {
             TeachCourseSelectParam teachCourseSelectParam = new TeachCourseSelectParam();
             teachCourseSelectParam.setSchoolId(schoolId);

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

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

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

@@ -1,21 +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.CourseEvaluationMapper">
-
-    <select id="findCourseEvaluationList"
-            resultType="com.qmth.distributed.print.business.bean.result.CourseEvaluationResult">
-        SELECT
-            id AS evaluationId,
-            evaluation,
-            evaluation_desc AS evaluationDesc,
-            type
-        FROM
-            course_evaluation
-        <where>
-            <if test="teachCourseId != null">
-                AND teach_course_id = #{teachCourseId}
-            </if>
-        </where>
-        ORDER BY id ASC
-    </select>
-</mapper>

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

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

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

@@ -1,31 +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.CourseWeightMapper">
-
-    <select id="findCourseWeightForm"
-            resultType="com.qmth.distributed.print.business.bean.dto.CourseWeightFormDto">
-        SELECT
-            ct.id AS targetId,
-            ct.target_name AS targetName,
-            ct.create_time AS targetCreateTime,
-            cw.target_score AS targetScore,
-            ce.id AS evaluationId,
-            ce.evaluation AS evaluation,
-            ce.evaluation_desc AS evaluationDesc,
-            ce.create_time AS evaluationCreateTime,
-            ce.type AS type
-        FROM
-            course_weight cw
-                LEFT JOIN
-            course_target ct ON cw.target_id = ct.id
-                LEFT JOIN
-            course_evaluation ce ON cw.evaluation_id = ce.id
-        <where>
-            AND cw.enable
-            <if test="teachCourseId != null">
-                AND cw.teach_course_id = #{teachCourseId}
-            </if>
-        </where>
-        ORDER BY ct.id,ce.id
-    </select>
-</mapper>

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

@@ -1,19 +0,0 @@
-package com.qmth.distributed.print.api;
-
-import com.qmth.boot.api.constant.ApiConstant;
-import com.qmth.teachcloud.common.contant.SystemConstant;
-import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @Description: 课程知识点管理
- * @Author: CaoZixuan
- * @Date: 2024-03-04
- */
-@Api(tags = "课程知识点管理controller")
-@RestController
-@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + SystemConstant.PREFIX_URL_TEACH + "/course_dimension")
-public class CourseDimensionController {
-
-}

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

@@ -1,73 +0,0 @@
-package com.qmth.distributed.print.api;
-
-
-import com.qmth.boot.api.constant.ApiConstant;
-import com.qmth.distributed.print.business.bean.params.CourseEvaluationParam;
-import com.qmth.distributed.print.business.bean.result.CourseEvaluationResult;
-import com.qmth.teachcloud.obe.enums.CourseEvaluationTypeEnum;
-import com.qmth.distributed.print.business.service.CourseEvaluationService;
-import com.qmth.teachcloud.common.annotation.OperationLogDetail;
-import com.qmth.teachcloud.common.contant.SystemConstant;
-import com.qmth.teachcloud.common.entity.SysUser;
-import com.qmth.teachcloud.common.enums.log.OperationTypeEnum;
-import com.qmth.teachcloud.common.util.Result;
-import com.qmth.teachcloud.common.util.ResultUtil;
-import com.qmth.teachcloud.common.util.ServletUtil;
-import io.swagger.annotations.*;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-import java.util.Objects;
-
-/**
- * <p>
- * 课程评价方式 前端控制器
- * </p>
- *
- * @author CaoZixuan
- * @since 2024-02-22
- */
-@Api(tags = "评价方式管理controller")
-@RestController
-@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + SystemConstant.PREFIX_URL_TEACH + "/course_evaluation")
-public class CourseEvaluationController {
-
-    @Resource
-    private CourseEvaluationService courseEvaluationService;
-
-    @ApiOperation(value = "评价方式管理-列表查询")
-    @RequestMapping(value = "/list", method = RequestMethod.POST)
-    @ApiResponses({ @ApiResponse(code = 200, message = "查询成功", response = CourseEvaluationResult.class) })
-    public Result findCourseEvaluation(@ApiParam(value = "教学课程id") @RequestParam(required = false) String teachCourseId) {
-        SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
-        return ResultUtil.ok(
-                courseEvaluationService.findCourseEvaluationList(SystemConstant.convertIdToLong(teachCourseId)));
-    }
-
-    @ApiOperation(value = "评价方式管理-新增/编辑")
-    @RequestMapping(value = "/save", method = RequestMethod.POST)
-    @ApiResponses({ @ApiResponse(code = 200, message = "更新成功", response = Result.class) })
-    @OperationLogDetail(operationType = OperationTypeEnum.SAVE)
-    public Result saveCourseEvaluation(@Valid @RequestBody CourseEvaluationParam courseEvaluationParam, BindingResult bindingResult) {
-        if (bindingResult.hasErrors()) {
-            return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
-        }
-        if (Objects.nonNull(courseEvaluationParam)) {
-            // 设置为自定义评价方式
-            courseEvaluationParam.setType(CourseEvaluationTypeEnum.CUSTOM);
-        }
-        courseEvaluationService.saveCourseEvaluation(courseEvaluationParam);
-        return ResultUtil.ok();
-    }
-
-    @ApiOperation(value = "评价方式管理-删除")
-    @RequestMapping(value = "/delete", method = RequestMethod.POST)
-    @ApiResponses({ @ApiResponse(code = 200, message = "删除成功", response = Result.class) })
-    @OperationLogDetail(operationType = OperationTypeEnum.DELETE)
-    public Result deleteCourseEvaluation(@ApiParam(value = "选择要删除的评价方式id", required = true) @RequestParam String id) {
-        courseEvaluationService.deleteCourseEvaluation(SystemConstant.convertIdToLong(id));
-        return ResultUtil.ok();
-    }
-}

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

@@ -1,122 +0,0 @@
-package com.qmth.distributed.print.api;
-
-import com.qmth.boot.api.constant.ApiConstant;
-import com.qmth.distributed.print.business.bean.params.CourseTargetParam;
-import com.qmth.distributed.print.business.bean.result.CourseDimensionTree;
-import com.qmth.distributed.print.business.bean.result.CourseTargetResult;
-import com.qmth.distributed.print.business.service.CourseDimensionService;
-import com.qmth.distributed.print.business.service.CourseTargetService;
-import com.qmth.distributed.print.business.service.TeachCourseService;
-import com.qmth.teachcloud.common.annotation.OperationLogDetail;
-import com.qmth.teachcloud.common.contant.SystemConstant;
-import com.qmth.teachcloud.common.entity.SysUser;
-import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
-import com.qmth.teachcloud.common.enums.log.OperationTypeEnum;
-import com.qmth.teachcloud.common.util.Result;
-import com.qmth.teachcloud.common.util.ResultUtil;
-import com.qmth.teachcloud.common.util.ServletUtil;
-import io.swagger.annotations.*;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-
-/**
- * <p>
- * 课程目标表 前端控制器
- * </p>
- *
- * @author CaoZixuan
- * @since 2024-02-22
- */
-@Api(tags = "课程目标管理controller")
-@RestController
-@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + SystemConstant.PREFIX_URL_TEACH + "/course_target")
-public class CourseTargetController {
-
-    private final static Logger log = LoggerFactory.getLogger(CourseTargetController.class);
-
-    @Resource
-    private CourseTargetService courseTargetService;
-
-    @Resource
-    private CourseDimensionService courseDimensionService;
-
-    @Resource
-    private TeachCourseService teachCourseService;
-
-    @ApiOperation(value = "课程目标管理-列表查询")
-    @RequestMapping(value = "/list", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = CourseTargetResult.class)})
-    public Result findCourseTargetList(@ApiParam(value = "教学课程id") @RequestParam(required = false) String teachCourseId,
-                                       @ApiParam(value = "考试id") @RequestParam(required = false) Long examId,
-                                       @ApiParam(value = "课程ID") @RequestParam(required = false) Long courseId) {
-        if (examId != null && courseId != null) {
-            if (SystemConstant.strNotNull(teachCourseId)) {
-                // 要么传examId和courseCode 要么传teachCourseId
-                throw ExceptionResultEnum.ERROR.exception("参数错误");
-            }
-            SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
-            teachCourseId = String.valueOf(teachCourseService.findByExamIdCourseIdAndUserId(examId, courseId, requestUser.getId()).getId());
-        }
-        return ResultUtil.ok(courseTargetService.findCourseTargetList(SystemConstant.convertIdToLong(teachCourseId)));
-    }
-
-    @ApiOperation(value = "课程目标管理-同步题库知识点")
-    @RequestMapping(value = "/dimension_sync_tiku", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = Result.class)})
-    public Result syncTikuDimension(@ApiParam(value = "教学课程id") @RequestParam(required = false) String teachCourseId) {
-        courseDimensionService.syncTikuCourseProperties(SystemConstant.convertIdToLong(teachCourseId));
-        return ResultUtil.ok();
-    }
-
-    @ApiOperation(value = "课程目标管理-导入课程知识点")
-    @RequestMapping(value = "/dimension_import", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = Result.class)})
-    @OperationLogDetail(operationType = OperationTypeEnum.IMPORT)
-    public Result courseDimensionImportSync(@ApiParam(value = "上传文件", required = true) @RequestParam MultipartFile file,
-                                            @ApiParam(value = "教学课程id") @RequestParam(required = false) String teachCourseId) throws Exception {
-        SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
-        courseDimensionService.importCourseDimension(requestUser, file, SystemConstant.convertIdToLong(teachCourseId));
-        return ResultUtil.ok();
-    }
-
-    @ApiOperation(value = "课程目标管理-课程知识点树查询")
-    @RequestMapping(value = "/dimension_tree", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = CourseDimensionTree.class)})
-    public Result findDimensionTree(@ApiParam(value = "教学课程id") @RequestParam(required = false) String teachCourseId) {
-        try {
-            courseDimensionService.syncTikuCourseProperties(SystemConstant.convertIdToLong(teachCourseId));
-        } catch (Exception e) {
-            log.error(e.getMessage());
-        }
-
-        return ResultUtil.ok(courseTargetService.findDimensionTree(SystemConstant.convertIdToLong(teachCourseId)));
-    }
-
-    @ApiOperation(value = "课程目标管理-新增/编辑")
-    @RequestMapping(value = "/save", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "更新成功", response = Result.class)})
-    @OperationLogDetail(operationType = OperationTypeEnum.SAVE)
-    public Result saveCourseTarget(@Valid @RequestBody CourseTargetParam courseTargetParam, BindingResult bindingResult) {
-        if (bindingResult.hasErrors()) {
-            return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
-        }
-        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-        courseTargetService.saveCourseTarget(courseTargetParam, sysUser);
-        return ResultUtil.ok();
-    }
-
-    @ApiOperation(value = "课程目标管理-删除")
-    @RequestMapping(value = "/delete", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "删除成功", response = Result.class)})
-    @OperationLogDetail(operationType = OperationTypeEnum.DELETE)
-    public Result deleteCourseTarget(@ApiParam(value = "选择要删除的课程目标id", required = true) @RequestParam String id) {
-        courseTargetService.deleteCourseTarget(SystemConstant.convertIdToLong(id));
-        return ResultUtil.ok();
-    }
-}

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

@@ -1,56 +0,0 @@
-package com.qmth.distributed.print.api;
-
-import com.qmth.boot.api.constant.ApiConstant;
-import com.qmth.distributed.print.business.bean.dto.CourseWeightDto;
-import com.qmth.distributed.print.business.bean.params.CourseWeightParam;
-import com.qmth.distributed.print.business.service.CourseWeightService;
-import com.qmth.teachcloud.common.annotation.OperationLogDetail;
-import com.qmth.teachcloud.common.contant.SystemConstant;
-import com.qmth.teachcloud.common.entity.SysUser;
-import com.qmth.teachcloud.common.enums.log.OperationTypeEnum;
-import com.qmth.teachcloud.common.util.Result;
-import com.qmth.teachcloud.common.util.ResultUtil;
-import com.qmth.teachcloud.common.util.ServletUtil;
-import io.swagger.annotations.*;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-
-/**
- * <p>
- * 课程权重设置 前端控制器
- * </p>
- *
- * @author CaoZixuan
- * @since 2024-02-22
- */
-@Api(tags = "课程权重管理controller")
-@RestController
-@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + SystemConstant.PREFIX_URL_TEACH + "/course_weight")
-public class CourseWeightController {
-
-    @Resource
-    private CourseWeightService courseWeightService;
-
-    @ApiOperation(value = "课程权重管理-列表查询")
-    @RequestMapping(value = "/find", method = RequestMethod.POST)
-    @ApiResponses({ @ApiResponse(code = 200, message = "查询成功", response = CourseWeightDto.class) })
-    public Result findCourseWeightList(@ApiParam(value = "教学课程id") @RequestParam(required = false) String teachCourseId) {
-        return ResultUtil.ok(courseWeightService.findCourseWeight(SystemConstant.convertIdToLong(teachCourseId)));
-    }
-
-    @ApiOperation(value = "课程权重管理-新增/编辑")
-    @RequestMapping(value = "/save", method = RequestMethod.POST)
-    @ApiResponses({ @ApiResponse(code = 200, message = "更新成功", response = Result.class) })
-    @OperationLogDetail(operationType = OperationTypeEnum.ADD)
-    public Result saveCourseWeight(@Valid @RequestBody CourseWeightParam courseWeightParam, BindingResult bindingResult) {
-        if (bindingResult.hasErrors()) {
-            return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
-        }
-        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-        courseWeightService.saveCourseWeight(courseWeightParam, sysUser);
-        return ResultUtil.ok();
-    }
-}

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

@@ -89,12 +89,4 @@ public class TeachCourseController {
                 idList.stream().map(SystemConstant::convertIdToLong).collect(Collectors.toList()));
         return ResultUtil.ok();
     }
-
-    @ApiOperation(value = "教学课程-查询课程权重设置状态")
-    @RequestMapping(value = "/find_course_weight_setting_status", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = Result.class)})
-    public Result findCourseWeightSettingStatus(@ApiParam(value = "教学课程id", required = true) @RequestParam String teachCourseId) {
-        return ResultUtil.ok(
-                teachCourseService.findCourseWeightSettingStatus(SystemConstant.convertIdToLong(teachCourseId)));
-    }
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/result/CourseWeightSettingStatusResult.java → teachcloud-obe/src/main/java/com/qmth/teachcloud/obe/been/result/CourseWeightSettingStatusResult.java

@@ -1,4 +1,4 @@
-package com.qmth.distributed.print.business.bean.result;
+package com.qmth.teachcloud.obe.been.result;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;