From 76493683c30373039988fffaf284fcae24869ec7 Mon Sep 17 00:00:00 2001 From: wanghu Date: Wed, 23 Sep 2026 08:33:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E7=A7=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/homework/HomeworkStatisticsVo.java | 2 ++ .../homework/model/homework/HomeworkVo.java | 3 ++ .../homework/model/v2/HomeworkV2Vo.java | 5 +++- .../homework/model/v2/StudentHomeworkVo.java | 3 ++ .../service/impl/HomeworkService.java | 18 +++++++---- .../service/impl/StudentHomeworkService.java | 16 ++++++---- .../impl/TeacherHomeworkV2Service.java | 30 ++++++++----------- 7 files changed, 48 insertions(+), 29 deletions(-) diff --git a/src/main/java/com/yunhai/homework/model/homework/HomeworkStatisticsVo.java b/src/main/java/com/yunhai/homework/model/homework/HomeworkStatisticsVo.java index c492f86..2f00099 100644 --- a/src/main/java/com/yunhai/homework/model/homework/HomeworkStatisticsVo.java +++ b/src/main/java/com/yunhai/homework/model/homework/HomeworkStatisticsVo.java @@ -52,6 +52,8 @@ public class HomeworkStatisticsVo { private Integer id; private String title; private String subject; + /** 学科名称（本校学科字典解析，未命中回退编码） */ + private String subjectName; /** 旧契约四态派生值：draft / collecting / closed / done */ private String hwStatus; private String hwStatusDesc; diff --git a/src/main/java/com/yunhai/homework/model/homework/HomeworkVo.java b/src/main/java/com/yunhai/homework/model/homework/HomeworkVo.java index a7597c4..811b822 100644 --- a/src/main/java/com/yunhai/homework/model/homework/HomeworkVo.java +++ b/src/main/java/com/yunhai/homework/model/homework/HomeworkVo.java @@ -56,6 +56,9 @@ public class HomeworkVo { /** 学科（字典值） */ private String subject; + /** 学科名称（本校学科字典解析，未命中回退编码） */ + private String subjectName; + /** 截止时间（前端契约字段名 deadline） */ private LocalDateTime deadline; diff --git a/src/main/java/com/yunhai/homework/model/v2/HomeworkV2Vo.java b/src/main/java/com/yunhai/homework/model/v2/HomeworkV2Vo.java index 8bf1b02..8e8d3be 100644 --- a/src/main/java/com/yunhai/homework/model/v2/HomeworkV2Vo.java +++ b/src/main/java/com/yunhai/homework/model/v2/HomeworkV2Vo.java @@ -16,9 +16,12 @@ public class HomeworkV2Vo { private String title; - /** 学科 */ + /** 学科编码 */ private String subject; + /** 学科名称（本校学科字典解析，未命中回退编码） */ + private String subjectName; + /** 作业说明（富文本；列表场景可置空省流） */ private String description; diff --git a/src/main/java/com/yunhai/homework/model/v2/StudentHomeworkVo.java b/src/main/java/com/yunhai/homework/model/v2/StudentHomeworkVo.java index 9d30037..5cf1d43 100644 --- a/src/main/java/com/yunhai/homework/model/v2/StudentHomeworkVo.java +++ b/src/main/java/com/yunhai/homework/model/v2/StudentHomeworkVo.java @@ -17,6 +17,9 @@ public class StudentHomeworkVo { /** 学科 */ private String subject; + /** 学科名称（本校学科字典解析，未命中回退编码） */ + private String subjectName; + /** 任课教师（发布人姓名） */ private String teacherName; diff --git a/src/main/java/com/yunhai/homework/service/impl/HomeworkService.java b/src/main/java/com/yunhai/homework/service/impl/HomeworkService.java index a828e0d..1172a84 100644 --- a/src/main/java/com/yunhai/homework/service/impl/HomeworkService.java +++ b/src/main/java/com/yunhai/homework/service/impl/HomeworkService.java @@ -92,6 +92,9 @@ public class HomeworkService implements IHomeworkService { @Autowired private IDictService dictService; + @Autowired + private SubjectDictService subjectDictService; + private static final int PUBLISHED = HomeworkStatusEnum.PUBLISHED.getCode(); // ============================ 发作业 ============================ @@ -269,8 +272,9 @@ public class HomeworkService implements IHomeworkService { Page page = homeworkRepository.findAll(userSpec(query, readIds), pageable); + Map subjectNames = subjectDictService.nameMap(); List content = page.getContent().stream() - .map(n -> toVo(n, readIds.contains(n.getId()))) + .map(n -> toVo(n, readIds.contains(n.getId()), subjectNames)) .collect(Collectors.toList()); long unreadCount = 0; @@ -322,8 +326,9 @@ public class HomeworkService implements IHomeworkService { @Override public BasePageResult adminList(HomeworkQuery query, Pageable pageable) { Page page = homeworkRepository.findAll(adminSpec(query), pageable); + Map subjectNames = subjectDictService.nameMap(); List content = page.getContent().stream() - .map(n -> toVo(n, false)) + .map(n -> toVo(n, false, subjectNames)) .collect(Collectors.toList()); // 批量填充附件ID串（"1,2,3"）：列表页"附件下载"入口依赖 UpFile 字段 if (!content.isEmpty()) { @@ -431,7 +436,7 @@ public class HomeworkService implements IHomeworkService { .orElseThrow(() -> new BizException(ErrorCode.FORBIDDEN, "作业不存在: " + id)); Integer userId = UserContext.getUserId(); boolean read = homeworkReadRepository.existsByHomeworkIdAndReaderId(id, userId); - HomeworkVo vo = toVo(entity, read); + HomeworkVo vo = toVo(entity, read, subjectDictService.nameMap()); if (!read) { markRead(id); vo.setRead(true); @@ -445,7 +450,7 @@ public class HomeworkService implements IHomeworkService { public HomeworkVo getDetail(Integer id) { Homework entity = homeworkRepository.findById(id) .orElseThrow(() -> new BizException(ErrorCode.FORBIDDEN, "作业不存在: " + id)); - HomeworkVo vo = toVo(entity, false); + HomeworkVo vo = toVo(entity, false, subjectDictService.nameMap()); vo.setReadCount(homeworkReadRepository.countByHomeworkId(entity.getId())); return vo; } @@ -779,6 +784,7 @@ public class HomeworkService implements IHomeworkService { Map> classMap = homeworkClassRepository.findByHomeworkIds(hwIds).stream() .collect(Collectors.groupingBy(HomeworkClass::getHomeworkId, Collectors.mapping(HomeworkClass::getClassId, Collectors.toList()))); + Map subjectNames = subjectDictService.nameMap(); long pendingTotal = 0; double submitRateSum = 0; @@ -794,6 +800,7 @@ public class HomeworkService implements IHomeworkService { d.setId(h.getId()); d.setTitle(h.getTitle()); d.setSubject(h.getSubject()); + d.setSubjectName(subjectDictService.resolve(h.getSubject(), subjectNames)); String legacy = legacyHwStatus(h); d.setHwStatus(legacy); d.setHwStatusDesc(legacyHwStatusDesc(legacy)); @@ -1009,7 +1016,7 @@ public class HomeworkService implements IHomeworkService { } } - private HomeworkVo toVo(Homework entity, boolean read) { + private HomeworkVo toVo(Homework entity, boolean read, Map subjectNames) { HomeworkVo vo = new HomeworkVo(); BeanUtils.copyProperties(entity, vo); vo.setTypeDesc(HomeworkTypeEnum.of(entity.getType()).getDesc()); @@ -1017,6 +1024,7 @@ public class HomeworkService implements IHomeworkService { // V2 扩展字段回填（hwStatus 输出旧四态派生值，submitType/deadline 手工映射） vo.setDeadline(entity.getDeadlineAt()); vo.setSubmitType(SubmitTypes.parse(entity.getSubmitType())); + vo.setSubjectName(subjectDictService.resolve(entity.getSubject(), subjectNames)); String legacy = legacyHwStatus(entity); vo.setHwStatus(legacy); vo.setHwStatusDesc(legacyHwStatusDesc(legacy)); diff --git a/src/main/java/com/yunhai/homework/service/impl/StudentHomeworkService.java b/src/main/java/com/yunhai/homework/service/impl/StudentHomeworkService.java index 14f67bf..980add9 100644 --- a/src/main/java/com/yunhai/homework/service/impl/StudentHomeworkService.java +++ b/src/main/java/com/yunhai/homework/service/impl/StudentHomeworkService.java @@ -71,6 +71,9 @@ public class StudentHomeworkService { @Autowired private RosterService rosterService; + @Autowired + private SubjectDictService subjectDictService; + // ============================ 页 1：作业列表 ============================ /** @@ -96,8 +99,9 @@ public class StudentHomeworkService { .collect(Collectors.toMap(HomeworkSubmission::getHomeworkId, s -> s, (a, b) -> a)); List rows = new ArrayList<>(); + Map subjectNames = subjectDictService.nameMap(); for (Homework h : homeworks) { - StudentHomeworkVo vo = toVo(h, myLatest.get(h.getId())); + StudentHomeworkVo vo = toVo(h, myLatest.get(h.getId()), subjectNames); rows.add(vo); } rows = filterByTab(rows, tab); @@ -150,7 +154,7 @@ public class StudentHomeworkService { HomeworkSubmission latest = myLatest(homework.getId()); StudentHomeworkDetailVo vo = new StudentHomeworkDetailVo(); - copyBase(vo, homework, latest); + copyBase(vo, homework, latest, subjectDictService.nameMap()); vo.setDescription(homework.getContent()); vo.setAttachments(homeworkAttachmentRepository.findByHomeworkIdOrderBySortAscIdAsc(id).stream() .map(this::toAttachmentItem).collect(Collectors.toList())); @@ -398,16 +402,18 @@ public class StudentHomeworkService { .orElse(null); } - private StudentHomeworkVo toVo(Homework h, HomeworkSubmission latest) { + private StudentHomeworkVo toVo(Homework h, HomeworkSubmission latest, Map subjectNames) { StudentHomeworkVo vo = new StudentHomeworkVo(); - copyBase(vo, h, latest); + copyBase(vo, h, latest, subjectNames); return vo; } - private void copyBase(StudentHomeworkVo vo, Homework h, HomeworkSubmission latest) { + private void copyBase(StudentHomeworkVo vo, Homework h, HomeworkSubmission latest, + Map subjectNames) { vo.setId(h.getId()); vo.setTitle(h.getTitle()); vo.setSubject(h.getSubject()); + vo.setSubjectName(subjectDictService.resolve(h.getSubject(), subjectNames)); vo.setTeacherName(h.getPublisherName()); vo.setDeadlineAt(h.getDeadlineAt()); vo.setSubmitType(SubmitTypes.parse(h.getSubmitType())); diff --git a/src/main/java/com/yunhai/homework/service/impl/TeacherHomeworkV2Service.java b/src/main/java/com/yunhai/homework/service/impl/TeacherHomeworkV2Service.java index 91df264..5f0c0ee 100644 --- a/src/main/java/com/yunhai/homework/service/impl/TeacherHomeworkV2Service.java +++ b/src/main/java/com/yunhai/homework/service/impl/TeacherHomeworkV2Service.java @@ -125,6 +125,9 @@ public class TeacherHomeworkV2Service { @Autowired private IClassService classService; + @Autowired + private SubjectDictService subjectDictService; + // ============================ 页 1：创建 / 编辑 ============================ /** @@ -254,7 +257,8 @@ public class TeacherHomeworkV2Service { Arrays.asList(HwStatusEnum.DRAFT_UNPUBLISHED.getCode(), HwStatusEnum.DRAFT_SCHEDULED.getCode()), query), PageUtils.toPageable(query, sort == null ? Sort.by(Sort.Direction.DESC, "updateTime") : sort)); - return PageUtils.toResult(page.map(h -> toVo(h, false, false))); + Map subjectNames = subjectDictService.nameMap(); + return PageUtils.toResult(page.map(h -> toVo(h, false, false, subjectNames))); } // ============================ 页 3：已发布列表 ============================ @@ -271,7 +275,8 @@ public class TeacherHomeworkV2Service { Page page = homeworkRepository.findAll( ownedStatusSpec(UserContext.getUserId(), statuses, query), PageUtils.toPageable(query, sort == null ? Sort.by(Sort.Direction.DESC, "publishedAt") : sort)); - return PageUtils.toResult(page.map(h -> toVo(h, false, true))); + Map subjectNames = subjectDictService.nameMap(); + return PageUtils.toResult(page.map(h -> toVo(h, false, true, subjectNames))); } private Specification ownedStatusSpec(Integer publisherId, List statuses, TeacherHomeworkQuery query) { @@ -391,7 +396,7 @@ public class TeacherHomeworkV2Service { @Transactional(readOnly = true) public HomeworkV2Vo detail(Integer id) { Homework homework = stateService.requireOwned(id, UserContext.getUserId()); - return toVo(homework, true, !HwStatusEnum.of(homework.getHwStatus()).isDraft()); + return toVo(homework, true, !HwStatusEnum.of(homework.getHwStatus()).isDraft(), subjectDictService.nameMap()); } /** @@ -1068,20 +1073,7 @@ public class TeacherHomeworkV2Service { * 仅影响名称解析（学科名称回退为编码），不阻断学科清单本身。 */ private List subjectDictionary() { - try { - Integer schId = UserContext.getSchId(); - if (schId == null) { - return Collections.emptyList(); - } - SchInfoDto sch = classService.getSchFirst(schId); - if (sch == null || !StringUtils.hasText(sch.getSchSerId())) { - return Collections.emptyList(); - } - return classService.getSchSubList(sch.getSchSerId()); - } catch (BizException e) { - log.warn("[subjectDictionary] 本校学科字典拉取失败, 降级为编码展示: {}", e.getMessage()); - return Collections.emptyList(); - } + return subjectDictService.dictionary(); } /** @@ -1120,11 +1112,13 @@ public class TeacherHomeworkV2Service { // ============================ VO 组装 ============================ - private HomeworkV2Vo toVo(Homework h, boolean withAttachments, boolean withProgress) { + private HomeworkV2Vo toVo(Homework h, boolean withAttachments, boolean withProgress, + Map subjectNames) { HomeworkV2Vo vo = new HomeworkV2Vo(); vo.setId(h.getId()); vo.setTitle(h.getTitle()); vo.setSubject(h.getSubject()); + vo.setSubjectName(subjectDictService.resolve(h.getSubject(), subjectNames)); vo.setDescription(withAttachments ? h.getContent() : null); vo.setHwStatus(h.getHwStatus()); vo.setHwStatusDesc(HwStatusEnum.of(h.getHwStatus()).getDesc());