From b8b35933dec29420b84aee645e7e6a7d7ba95e39 Mon Sep 17 00:00:00 2001 From: zhanglei Date: Wed, 19 Aug 2026 10:39:19 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=95=99=E5=9F=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CourseManagementController.java | 2 +- .../CourseRelCoursewareController.java | 2 +- .../CoursewareManagementController.java | 2 +- .../convertor/CourseManagementConvertor.java | 2 +- .../CourseRelCoursewareConvertor.java | 2 +- .../CoursewareManagementConvertor.java | 2 +- .../model/{dto => vo}/CourseManagementVO.java | 3 +- .../{dto => vo}/CourseRelCoursewareVO.java | 2 +- .../{dto => vo}/CoursewareManagementVO.java | 8 ++-- .../org/qinan/cedu/model/vo/QuestionVO.java | 44 +++++++++++++++++++ .../cedu/service/CourseManagementService.java | 2 +- .../service/CourseRelCoursewareService.java | 2 +- .../service/CoursewareManagementService.java | 2 +- .../impl/CourseManagementServiceImpl.java | 2 +- .../impl/CourseRelCoursewareServiceImpl.java | 2 +- .../impl/CoursewareManagementServiceImpl.java | 7 +-- 16 files changed, 67 insertions(+), 19 deletions(-) rename safety-cedu-service/src/main/java/org/qinan/cedu/model/{dto => vo}/CourseManagementVO.java (94%) rename safety-cedu-service/src/main/java/org/qinan/cedu/model/{dto => vo}/CourseRelCoursewareVO.java (96%) rename safety-cedu-service/src/main/java/org/qinan/cedu/model/{dto => vo}/CoursewareManagementVO.java (90%) create mode 100644 safety-cedu-service/src/main/java/org/qinan/cedu/model/vo/QuestionVO.java diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/controller/CourseManagementController.java b/safety-cedu-service/src/main/java/org/qinan/cedu/controller/CourseManagementController.java index 49690a4d..e9f77182 100644 --- a/safety-cedu-service/src/main/java/org/qinan/cedu/controller/CourseManagementController.java +++ b/safety-cedu-service/src/main/java/org/qinan/cedu/controller/CourseManagementController.java @@ -5,7 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import org.qinan.cedu.model.dto.CourseManagementDTO; -import org.qinan.cedu.model.dto.CourseManagementVO; +import org.qinan.cedu.model.vo.CourseManagementVO; import org.qinan.cedu.model.query.CourseManagementPageQuery; import org.qinan.cedu.service.CourseManagementService; import org.qinan.safetyeval.client.dto.PageResponse; diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/controller/CourseRelCoursewareController.java b/safety-cedu-service/src/main/java/org/qinan/cedu/controller/CourseRelCoursewareController.java index d280a8cc..d45647a8 100644 --- a/safety-cedu-service/src/main/java/org/qinan/cedu/controller/CourseRelCoursewareController.java +++ b/safety-cedu-service/src/main/java/org/qinan/cedu/controller/CourseRelCoursewareController.java @@ -5,7 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import org.qinan.cedu.model.dto.CourseRelCoursewareDTO; -import org.qinan.cedu.model.dto.CourseRelCoursewareVO; +import org.qinan.cedu.model.vo.CourseRelCoursewareVO; import org.qinan.cedu.service.CourseRelCoursewareService; import org.qinan.safetyeval.client.dto.PageResponse; import org.qinan.safetyeval.client.dto.SingleResponse; diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/controller/CoursewareManagementController.java b/safety-cedu-service/src/main/java/org/qinan/cedu/controller/CoursewareManagementController.java index 2d15721a..034a6226 100644 --- a/safety-cedu-service/src/main/java/org/qinan/cedu/controller/CoursewareManagementController.java +++ b/safety-cedu-service/src/main/java/org/qinan/cedu/controller/CoursewareManagementController.java @@ -5,7 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import org.qinan.cedu.model.dto.CoursewareManagementDTO; -import org.qinan.cedu.model.dto.CoursewareManagementVO; +import org.qinan.cedu.model.vo.CoursewareManagementVO; import org.qinan.cedu.model.query.CoursewareManagementPageQuery; import org.qinan.cedu.service.CoursewareManagementService; import org.qinan.safetyeval.client.dto.PageResponse; diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/convertor/CourseManagementConvertor.java b/safety-cedu-service/src/main/java/org/qinan/cedu/convertor/CourseManagementConvertor.java index 45abc8e0..320f7e7e 100644 --- a/safety-cedu-service/src/main/java/org/qinan/cedu/convertor/CourseManagementConvertor.java +++ b/safety-cedu-service/src/main/java/org/qinan/cedu/convertor/CourseManagementConvertor.java @@ -2,7 +2,7 @@ package org.qinan.cedu.convertor; import org.mapstruct.Mapper; import org.qinan.cedu.model.dto.CourseManagementDTO; -import org.qinan.cedu.model.dto.CourseManagementVO; +import org.qinan.cedu.model.vo.CourseManagementVO; import org.qinan.cedu.model.entity.CourseManagementDO; import java.util.List; diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/convertor/CourseRelCoursewareConvertor.java b/safety-cedu-service/src/main/java/org/qinan/cedu/convertor/CourseRelCoursewareConvertor.java index a55e3c07..baf475d5 100644 --- a/safety-cedu-service/src/main/java/org/qinan/cedu/convertor/CourseRelCoursewareConvertor.java +++ b/safety-cedu-service/src/main/java/org/qinan/cedu/convertor/CourseRelCoursewareConvertor.java @@ -2,7 +2,7 @@ package org.qinan.cedu.convertor; import org.mapstruct.Mapper; import org.qinan.cedu.model.dto.CourseRelCoursewareDTO; -import org.qinan.cedu.model.dto.CourseRelCoursewareVO; +import org.qinan.cedu.model.vo.CourseRelCoursewareVO; import org.qinan.cedu.model.entity.CourseRelCoursewareDO; import java.util.List; diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/convertor/CoursewareManagementConvertor.java b/safety-cedu-service/src/main/java/org/qinan/cedu/convertor/CoursewareManagementConvertor.java index 83258806..c41f21fd 100644 --- a/safety-cedu-service/src/main/java/org/qinan/cedu/convertor/CoursewareManagementConvertor.java +++ b/safety-cedu-service/src/main/java/org/qinan/cedu/convertor/CoursewareManagementConvertor.java @@ -2,7 +2,7 @@ package org.qinan.cedu.convertor; import org.mapstruct.Mapper; import org.qinan.cedu.model.dto.CoursewareManagementDTO; -import org.qinan.cedu.model.dto.CoursewareManagementVO; +import org.qinan.cedu.model.vo.CoursewareManagementVO; import org.qinan.cedu.model.entity.CoursewareManagementDO; import java.util.List; diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/model/dto/CourseManagementVO.java b/safety-cedu-service/src/main/java/org/qinan/cedu/model/vo/CourseManagementVO.java similarity index 94% rename from safety-cedu-service/src/main/java/org/qinan/cedu/model/dto/CourseManagementVO.java rename to safety-cedu-service/src/main/java/org/qinan/cedu/model/vo/CourseManagementVO.java index befea116..376657ff 100644 --- a/safety-cedu-service/src/main/java/org/qinan/cedu/model/dto/CourseManagementVO.java +++ b/safety-cedu-service/src/main/java/org/qinan/cedu/model/vo/CourseManagementVO.java @@ -1,8 +1,9 @@ -package org.qinan.cedu.model.dto; +package org.qinan.cedu.model.vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import org.qinan.cedu.model.dto.BaseVO; import java.math.BigDecimal; import java.util.List; diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/model/dto/CourseRelCoursewareVO.java b/safety-cedu-service/src/main/java/org/qinan/cedu/model/vo/CourseRelCoursewareVO.java similarity index 96% rename from safety-cedu-service/src/main/java/org/qinan/cedu/model/dto/CourseRelCoursewareVO.java rename to safety-cedu-service/src/main/java/org/qinan/cedu/model/vo/CourseRelCoursewareVO.java index 293820bf..88594836 100644 --- a/safety-cedu-service/src/main/java/org/qinan/cedu/model/dto/CourseRelCoursewareVO.java +++ b/safety-cedu-service/src/main/java/org/qinan/cedu/model/vo/CourseRelCoursewareVO.java @@ -1,4 +1,4 @@ -package org.qinan.cedu.model.dto; +package org.qinan.cedu.model.vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/model/dto/CoursewareManagementVO.java b/safety-cedu-service/src/main/java/org/qinan/cedu/model/vo/CoursewareManagementVO.java similarity index 90% rename from safety-cedu-service/src/main/java/org/qinan/cedu/model/dto/CoursewareManagementVO.java rename to safety-cedu-service/src/main/java/org/qinan/cedu/model/vo/CoursewareManagementVO.java index 73d18440..39ff6800 100644 --- a/safety-cedu-service/src/main/java/org/qinan/cedu/model/dto/CoursewareManagementVO.java +++ b/safety-cedu-service/src/main/java/org/qinan/cedu/model/vo/CoursewareManagementVO.java @@ -1,10 +1,12 @@ -package org.qinan.cedu.model.dto; +package org.qinan.cedu.model.vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import org.qinan.cedu.model.dto.BaseVO; import java.math.BigDecimal; +import java.util.List; /** * 课件表 @@ -74,6 +76,6 @@ public class CoursewareManagementVO extends BaseVO { @ApiModelProperty("课件描述") private String coursewareDescription; - @ApiModelProperty("习题数") - private Long exerciseCount; + @ApiModelProperty("习题ID") + private List questionIds; } \ No newline at end of file diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/model/vo/QuestionVO.java b/safety-cedu-service/src/main/java/org/qinan/cedu/model/vo/QuestionVO.java new file mode 100644 index 00000000..d0133597 --- /dev/null +++ b/safety-cedu-service/src/main/java/org/qinan/cedu/model/vo/QuestionVO.java @@ -0,0 +1,44 @@ + +package org.qinan.cedu.model.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.qinan.cedu.model.dto.BaseVO; + +import java.math.BigDecimal; + +/** + * 试题 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class QuestionVO extends BaseVO { + + @ApiModelProperty("题目内容") + private String title; + + @ApiModelProperty("题型：single单选/multiple多选/judge判断/fill填空/short简答") + private String questionType; + + @ApiModelProperty("参考答案：逗号隔开") + private String answer; + + @ApiModelProperty("答案选项id 多个逗号隔开") + private String answerQuestionOptionIds; + + @ApiModelProperty("子题 多个逗号分割") + private String childrenQuestionIds; + + @ApiModelProperty("分值") + private BigDecimal score; + + @ApiModelProperty("答案解析") + private String analysis; + + @ApiModelProperty("标签类型") + private String tagType; + + @ApiModelProperty("关联课件管理id") + private Long coursewareManagementId; +} diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/service/CourseManagementService.java b/safety-cedu-service/src/main/java/org/qinan/cedu/service/CourseManagementService.java index 7a8be2b2..2e13efce 100644 --- a/safety-cedu-service/src/main/java/org/qinan/cedu/service/CourseManagementService.java +++ b/safety-cedu-service/src/main/java/org/qinan/cedu/service/CourseManagementService.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import org.qinan.cedu.model.dto.CourseManagementDTO; import org.qinan.cedu.model.query.CourseManagementPageQuery; -import org.qinan.cedu.model.dto.CourseManagementVO; +import org.qinan.cedu.model.vo.CourseManagementVO; import org.qinan.cedu.model.entity.CourseManagementDO; /** diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/service/CourseRelCoursewareService.java b/safety-cedu-service/src/main/java/org/qinan/cedu/service/CourseRelCoursewareService.java index 3c12d407..de41de6d 100644 --- a/safety-cedu-service/src/main/java/org/qinan/cedu/service/CourseRelCoursewareService.java +++ b/safety-cedu-service/src/main/java/org/qinan/cedu/service/CourseRelCoursewareService.java @@ -3,7 +3,7 @@ package org.qinan.cedu.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import org.qinan.cedu.model.dto.CourseRelCoursewareDTO; -import org.qinan.cedu.model.dto.CourseRelCoursewareVO; +import org.qinan.cedu.model.vo.CourseRelCoursewareVO; import org.qinan.cedu.model.entity.CourseRelCoursewareDO; import java.util.List; diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/service/CoursewareManagementService.java b/safety-cedu-service/src/main/java/org/qinan/cedu/service/CoursewareManagementService.java index 0eea5583..69232894 100644 --- a/safety-cedu-service/src/main/java/org/qinan/cedu/service/CoursewareManagementService.java +++ b/safety-cedu-service/src/main/java/org/qinan/cedu/service/CoursewareManagementService.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import org.qinan.cedu.model.dto.CoursewareManagementDTO; import org.qinan.cedu.model.query.CoursewareManagementPageQuery; -import org.qinan.cedu.model.dto.CoursewareManagementVO; +import org.qinan.cedu.model.vo.CoursewareManagementVO; import org.qinan.cedu.model.entity.CoursewareManagementDO; /** diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/service/impl/CourseManagementServiceImpl.java b/safety-cedu-service/src/main/java/org/qinan/cedu/service/impl/CourseManagementServiceImpl.java index aa7e0487..daefa50f 100644 --- a/safety-cedu-service/src/main/java/org/qinan/cedu/service/impl/CourseManagementServiceImpl.java +++ b/safety-cedu-service/src/main/java/org/qinan/cedu/service/impl/CourseManagementServiceImpl.java @@ -10,7 +10,7 @@ import org.qinan.cedu.enums.DeleteEnum; import org.qinan.cedu.mapper.CourseManagementMapper; import org.qinan.cedu.mapper.CourseRelCoursewareMapper; import org.qinan.cedu.model.dto.CourseManagementDTO; -import org.qinan.cedu.model.dto.CourseManagementVO; +import org.qinan.cedu.model.vo.CourseManagementVO; import org.qinan.cedu.model.entity.CourseManagementDO; import org.qinan.cedu.model.entity.CourseRelCoursewareDO; import org.qinan.cedu.model.query.CourseManagementPageQuery; diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/service/impl/CourseRelCoursewareServiceImpl.java b/safety-cedu-service/src/main/java/org/qinan/cedu/service/impl/CourseRelCoursewareServiceImpl.java index bf3e07cf..4fa4bfb9 100644 --- a/safety-cedu-service/src/main/java/org/qinan/cedu/service/impl/CourseRelCoursewareServiceImpl.java +++ b/safety-cedu-service/src/main/java/org/qinan/cedu/service/impl/CourseRelCoursewareServiceImpl.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.qinan.cedu.convertor.CourseRelCoursewareConvertor; import org.qinan.cedu.mapper.CourseRelCoursewareMapper; import org.qinan.cedu.model.dto.CourseRelCoursewareDTO; -import org.qinan.cedu.model.dto.CourseRelCoursewareVO; +import org.qinan.cedu.model.vo.CourseRelCoursewareVO; import org.qinan.cedu.model.entity.CourseRelCoursewareDO; import org.qinan.cedu.service.CourseRelCoursewareService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/service/impl/CoursewareManagementServiceImpl.java b/safety-cedu-service/src/main/java/org/qinan/cedu/service/impl/CoursewareManagementServiceImpl.java index 69671a64..17647f83 100644 --- a/safety-cedu-service/src/main/java/org/qinan/cedu/service/impl/CoursewareManagementServiceImpl.java +++ b/safety-cedu-service/src/main/java/org/qinan/cedu/service/impl/CoursewareManagementServiceImpl.java @@ -9,7 +9,7 @@ import org.qinan.cedu.enums.DeleteEnum; import org.qinan.cedu.mapper.CoursewareManagementMapper; import org.qinan.cedu.mapper.QuestionMapper; import org.qinan.cedu.model.dto.CoursewareManagementDTO; -import org.qinan.cedu.model.dto.CoursewareManagementVO; +import org.qinan.cedu.model.vo.CoursewareManagementVO; import org.qinan.cedu.model.entity.CoursewareManagementDO; import org.qinan.cedu.model.entity.QuestionDO; import org.qinan.cedu.model.query.CoursewareManagementPageQuery; @@ -22,6 +22,7 @@ import org.springframework.util.StringUtils; import java.math.BigDecimal; import java.math.RoundingMode; import java.time.LocalDateTime; +import java.util.stream.Collectors; /** * 课件管理服务实现 @@ -47,7 +48,7 @@ public class CoursewareManagementServiceImpl extends ServiceImpl(query.getCurrent(), query.getSize())); IPage convert = page.convert(coursewareManagementConvertor::convertEToVo); for (CoursewareManagementVO record : convert.getRecords()) { - record.setExerciseCount(questionMapper.selectCount(new LambdaQueryWrapper().eq(QuestionDO::getCoursewareManagementId, record.getId()))); + record.setQuestionIds(questionMapper.selectList(new LambdaQueryWrapper().eq(QuestionDO::getCoursewareManagementId, record.getId())).stream().map(QuestionDO::getId).collect(Collectors.toList())); } return convert; } @@ -59,7 +60,7 @@ public class CoursewareManagementServiceImpl extends ServiceImpl().eq(QuestionDO::getCoursewareManagementId, coursewareManagementVO.getId()))); + coursewareManagementVO.setQuestionIds(questionMapper.selectList(new LambdaQueryWrapper().eq(QuestionDO::getCoursewareManagementId, coursewareManagementVO.getId())).stream().map(QuestionDO::getId).collect(Collectors.toList())); return coursewareManagementVO; }