From e621ed1c8cdb984a0db9843f7dbd59794b0d9356 Mon Sep 17 00:00:00 2001 From: "hhb@hotmail.com" Date: Thu, 15 May 2025 11:49:16 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=9B=B4=E6=96=B0=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/TeacherServiceImpl.java | 26 +++++++++---------- .../teammodel/test/AsyncTeacherService.java | 4 +-- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/main/java/cn/teammodel/controller/admin/service/impl/TeacherServiceImpl.java b/src/main/java/cn/teammodel/controller/admin/service/impl/TeacherServiceImpl.java index de17fde..37e5c5b 100644 --- a/src/main/java/cn/teammodel/controller/admin/service/impl/TeacherServiceImpl.java +++ b/src/main/java/cn/teammodel/controller/admin/service/impl/TeacherServiceImpl.java @@ -216,19 +216,19 @@ public class TeacherServiceImpl implements TeacherService { .map(GpTeacherVo::getId) .collect(Collectors.toSet()); - String code = String.format(PK.PTTEACHER, teacherDto.getCode()); - List ptTeacherInfos = ptTeacherRepository.findAllTeacher(teacherIds, code); - Map idToPtTeacherInfo = ptTeacherInfos.stream() - .collect(Collectors.toMap(PtTeacherInfo::getId, Function.identity())); - - teachersList.forEach(teacher -> { - PtTeacherInfo info = idToPtTeacherInfo.get(teacher.getId()); - if (info != null) { - teacher.setIdentity(info.getIdentity()); - } - }); - teachers.put("info", teachersList); - //teachers.remove("teachers"); + //String code = String.format(PK.PTTEACHER, teacherDto.getCode()); + List ptTeacherInfos = ptTeacherRepository.findAllTeacher(teacherIds, teacherDto.getCode()); +// Map idToPtTeacherInfo = ptTeacherInfos.stream() +// .collect(Collectors.toMap(PtTeacherInfo::getId, Function.identity())); +// +// teachersList.forEach(teacher -> { +// PtTeacherInfo info = idToPtTeacherInfo.get(teacher.getId()); +// if (info != null) { +// teacher.setIdentity(info.getIdentity()); +// } +// }); + teachers.put("info", ptTeacherInfos); + teachers.remove("teachers"); }catch (Exception e) { diff --git a/src/main/java/cn/teammodel/test/AsyncTeacherService.java b/src/main/java/cn/teammodel/test/AsyncTeacherService.java index 637e482..3fa99f1 100644 --- a/src/main/java/cn/teammodel/test/AsyncTeacherService.java +++ b/src/main/java/cn/teammodel/test/AsyncTeacherService.java @@ -65,7 +65,7 @@ public class AsyncTeacherService { return existingList.stream() .collect(Collectors.toMap( - PtTeacherInfo::getCode, + PtTeacherInfo::getId, Function.identity() )); } @@ -73,7 +73,7 @@ public class AsyncTeacherService { private PtTeacherInfo convertToPtTeacherInfo(GpTeacherVo teacher, Map existingTeachers) { String code = "PtTeacher-" + teacher.getCode(); - PtTeacherInfo existing = existingTeachers.get(code); + PtTeacherInfo existing = existingTeachers.get(teacher.getId()); // 如果数据库无记录，直接创建新对象 if (existing == null) { return createNewPtTeacherInfo(teacher, code);