From 3479466d42b645cdf755500decf4e5bda104eb0d Mon Sep 17 00:00:00 2001 From: "s:103" <2040484356@qq.com> Date: Sun, 8 Sep 2024 11:16:59 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/email/service/impl/EmailServiceImpl.java | 6 +++--- .../events/internal/InterviewExperienceHelper.java | 10 +++++----- .../events/internal/InterviewSummaryHelper.java | 6 +++--- .../events/internal/InterviewStateNoticeHelper.java | 6 +++--- .../machine/events/internal/ResumeConfirmHelper.java | 12 ++++++------ .../domain/users/controller/MemberController.java | 2 +- .../com/achobeta/domain/users/model/vo/MemberVO.java | 1 - .../domain/users/model/vo/SimpleMemberVO.java | 1 - .../domain/users/service/impl/MemberServiceImpl.java | 10 +++++----- .../com/achobeta/template/engine/MarkdownEngine.java | 1 - src/main/java/com/achobeta/util/ObjectUtil.java | 2 +- 11 files changed, 27 insertions(+), 30 deletions(-) diff --git a/src/main/java/com/achobeta/domain/email/service/impl/EmailServiceImpl.java b/src/main/java/com/achobeta/domain/email/service/impl/EmailServiceImpl.java index 26041f6a..64831312 100644 --- a/src/main/java/com/achobeta/domain/email/service/impl/EmailServiceImpl.java +++ b/src/main/java/com/achobeta/domain/email/service/impl/EmailServiceImpl.java @@ -1,12 +1,12 @@ package com.achobeta.domain.email.service.impl; -import com.achobeta.email.model.po.EmailMessage; import com.achobeta.domain.email.model.vo.VerificationCodeTemplate; -import com.achobeta.email.EmailSender; import com.achobeta.domain.email.service.EmailService; -import com.achobeta.template.engine.HtmlEngine; +import com.achobeta.email.EmailSender; +import com.achobeta.email.model.po.EmailMessage; import com.achobeta.exception.GlobalServiceException; import com.achobeta.redis.RedisCache; +import com.achobeta.template.engine.HtmlEngine; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/com/achobeta/domain/evaluate/machine/events/internal/InterviewExperienceHelper.java b/src/main/java/com/achobeta/domain/evaluate/machine/events/internal/InterviewExperienceHelper.java index 6840d6a4..6f430b4a 100644 --- a/src/main/java/com/achobeta/domain/evaluate/machine/events/internal/InterviewExperienceHelper.java +++ b/src/main/java/com/achobeta/domain/evaluate/machine/events/internal/InterviewExperienceHelper.java @@ -3,15 +3,10 @@ import com.achobeta.common.enums.EmailTemplateEnum; import com.achobeta.common.enums.InterviewEvent; import com.achobeta.common.enums.InterviewStatus; -import com.achobeta.email.model.po.EmailMessage; -import com.achobeta.email.EmailSender; import com.achobeta.domain.evaluate.model.vo.InterviewExperienceTemplateClose; import com.achobeta.domain.evaluate.model.vo.InterviewExperienceTemplateInner; import com.achobeta.domain.evaluate.model.vo.InterviewExperienceTemplateOpen; import com.achobeta.domain.evaluate.service.InterviewQuestionScoreService; -import com.achobeta.template.model.po.HtmlResource; -import com.achobeta.template.model.po.MarkdownReplaceResource; -import com.achobeta.template.engine.HtmlEngine; import com.achobeta.domain.interview.machine.context.InterviewContext; import com.achobeta.domain.interview.machine.events.internal.InterviewStateInternalTransitionHelper; import com.achobeta.domain.interview.model.vo.InterviewDetailVO; @@ -19,6 +14,11 @@ import com.achobeta.domain.schedule.model.vo.ScheduleVO; import com.achobeta.domain.schedule.service.InterviewScheduleService; import com.achobeta.domain.student.model.vo.SimpleStudentVO; +import com.achobeta.email.EmailSender; +import com.achobeta.email.model.po.EmailMessage; +import com.achobeta.template.engine.HtmlEngine; +import com.achobeta.template.model.po.HtmlResource; +import com.achobeta.template.model.po.MarkdownReplaceResource; import com.achobeta.template.util.TemplateUtil; import com.alibaba.cola.statemachine.Action; import com.alibaba.cola.statemachine.Condition; diff --git a/src/main/java/com/achobeta/domain/evaluate/machine/events/internal/InterviewSummaryHelper.java b/src/main/java/com/achobeta/domain/evaluate/machine/events/internal/InterviewSummaryHelper.java index 7df36e4d..ca5c07a8 100644 --- a/src/main/java/com/achobeta/domain/evaluate/machine/events/internal/InterviewSummaryHelper.java +++ b/src/main/java/com/achobeta/domain/evaluate/machine/events/internal/InterviewSummaryHelper.java @@ -3,18 +3,18 @@ import com.achobeta.common.enums.EmailTemplateEnum; import com.achobeta.common.enums.InterviewEvent; import com.achobeta.common.enums.InterviewStatus; -import com.achobeta.email.model.po.EmailMessage; -import com.achobeta.email.EmailSender; import com.achobeta.domain.evaluate.model.vo.InterviewSummaryTemplate; import com.achobeta.domain.evaluate.model.vo.InterviewSummaryVO; import com.achobeta.domain.evaluate.service.InterviewSummaryService; -import com.achobeta.template.engine.HtmlEngine; import com.achobeta.domain.interview.machine.context.InterviewContext; import com.achobeta.domain.interview.machine.events.internal.InterviewStateInternalTransitionHelper; import com.achobeta.domain.interview.model.vo.InterviewDetailVO; import com.achobeta.domain.interview.service.InterviewService; import com.achobeta.domain.schedule.service.InterviewScheduleService; import com.achobeta.domain.student.model.vo.SimpleStudentVO; +import com.achobeta.email.EmailSender; +import com.achobeta.email.model.po.EmailMessage; +import com.achobeta.template.engine.HtmlEngine; import com.alibaba.cola.statemachine.Action; import com.alibaba.cola.statemachine.Condition; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/achobeta/domain/interview/machine/events/internal/InterviewStateNoticeHelper.java b/src/main/java/com/achobeta/domain/interview/machine/events/internal/InterviewStateNoticeHelper.java index bade7c21..6562a0e7 100644 --- a/src/main/java/com/achobeta/domain/interview/machine/events/internal/InterviewStateNoticeHelper.java +++ b/src/main/java/com/achobeta/domain/interview/machine/events/internal/InterviewStateNoticeHelper.java @@ -3,9 +3,6 @@ import com.achobeta.common.enums.EmailTemplateEnum; import com.achobeta.common.enums.InterviewEvent; import com.achobeta.common.enums.InterviewStatus; -import com.achobeta.email.model.po.EmailMessage; -import com.achobeta.email.EmailSender; -import com.achobeta.template.engine.HtmlEngine; import com.achobeta.domain.interview.machine.context.InterviewContext; import com.achobeta.domain.interview.model.entity.Interview; import com.achobeta.domain.interview.model.vo.InterviewDetailVO; @@ -15,6 +12,9 @@ import com.achobeta.domain.schedule.model.vo.ScheduleVO; import com.achobeta.domain.schedule.service.InterviewScheduleService; import com.achobeta.domain.student.model.vo.SimpleStudentVO; +import com.achobeta.email.EmailSender; +import com.achobeta.email.model.po.EmailMessage; +import com.achobeta.template.engine.HtmlEngine; import com.alibaba.cola.statemachine.Action; import com.alibaba.cola.statemachine.Condition; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/achobeta/domain/resumestate/machine/events/internal/ResumeConfirmHelper.java b/src/main/java/com/achobeta/domain/resumestate/machine/events/internal/ResumeConfirmHelper.java index ff494603..bc22efb6 100644 --- a/src/main/java/com/achobeta/domain/resumestate/machine/events/internal/ResumeConfirmHelper.java +++ b/src/main/java/com/achobeta/domain/resumestate/machine/events/internal/ResumeConfirmHelper.java @@ -3,16 +3,16 @@ import com.achobeta.common.enums.EmailTemplateEnum; import com.achobeta.common.enums.ResumeEvent; import com.achobeta.common.enums.ResumeStatus; -import com.achobeta.email.model.po.EmailMessage; -import com.achobeta.email.EmailSender; -import com.achobeta.template.engine.HtmlEngine; import com.achobeta.domain.resumestate.machine.context.ResumeContext; -import com.achobeta.domain.users.model.dto.MemberDTO; import com.achobeta.domain.resumestate.model.dto.ResumeExecuteDTO; -import com.achobeta.domain.users.model.entity.Member; import com.achobeta.domain.resumestate.model.vo.ConfirmationNoticeTemplate; -import com.achobeta.domain.users.service.MemberService; import com.achobeta.domain.student.model.entity.StuResume; +import com.achobeta.domain.users.model.dto.MemberDTO; +import com.achobeta.domain.users.model.entity.Member; +import com.achobeta.domain.users.service.MemberService; +import com.achobeta.email.EmailSender; +import com.achobeta.email.model.po.EmailMessage; +import com.achobeta.template.engine.HtmlEngine; import com.achobeta.util.ValidatorUtils; import com.alibaba.cola.statemachine.Action; import com.alibaba.cola.statemachine.Condition; diff --git a/src/main/java/com/achobeta/domain/users/controller/MemberController.java b/src/main/java/com/achobeta/domain/users/controller/MemberController.java index 93bd7d98..c7d1d3aa 100644 --- a/src/main/java/com/achobeta/domain/users/controller/MemberController.java +++ b/src/main/java/com/achobeta/domain/users/controller/MemberController.java @@ -3,10 +3,10 @@ import com.achobeta.common.SystemJsonResponse; import com.achobeta.common.annotation.Intercept; import com.achobeta.common.enums.UserTypeEnum; +import com.achobeta.domain.users.context.BaseContext; import com.achobeta.domain.users.model.vo.MemberVO; import com.achobeta.domain.users.model.vo.SimpleMemberVO; import com.achobeta.domain.users.service.MemberService; -import com.achobeta.domain.users.context.BaseContext; import jakarta.validation.constraints.NotNull; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/achobeta/domain/users/model/vo/MemberVO.java b/src/main/java/com/achobeta/domain/users/model/vo/MemberVO.java index 8acaede4..afb0de58 100644 --- a/src/main/java/com/achobeta/domain/users/model/vo/MemberVO.java +++ b/src/main/java/com/achobeta/domain/users/model/vo/MemberVO.java @@ -1,7 +1,6 @@ package com.achobeta.domain.users.model.vo; import com.achobeta.domain.student.model.vo.StuResumeVO; -import com.achobeta.domain.users.model.vo.UserVO; import lombok.Data; /** diff --git a/src/main/java/com/achobeta/domain/users/model/vo/SimpleMemberVO.java b/src/main/java/com/achobeta/domain/users/model/vo/SimpleMemberVO.java index 4ebdcc10..90e9c46f 100644 --- a/src/main/java/com/achobeta/domain/users/model/vo/SimpleMemberVO.java +++ b/src/main/java/com/achobeta/domain/users/model/vo/SimpleMemberVO.java @@ -1,7 +1,6 @@ package com.achobeta.domain.users.model.vo; import com.achobeta.domain.student.model.vo.SimpleStudentVO; -import com.achobeta.domain.users.model.vo.UserVO; import lombok.Data; /** diff --git a/src/main/java/com/achobeta/domain/users/service/impl/MemberServiceImpl.java b/src/main/java/com/achobeta/domain/users/service/impl/MemberServiceImpl.java index d70afcce..35574516 100644 --- a/src/main/java/com/achobeta/domain/users/service/impl/MemberServiceImpl.java +++ b/src/main/java/com/achobeta/domain/users/service/impl/MemberServiceImpl.java @@ -4,18 +4,18 @@ import com.achobeta.domain.login.model.dao.UserEntity; import com.achobeta.domain.login.model.dto.RegisterDTO; import com.achobeta.domain.login.service.LoginService; +import com.achobeta.domain.student.model.dto.QueryResumeDTO; +import com.achobeta.domain.student.model.vo.StuResumeVO; +import com.achobeta.domain.student.service.StuResumeService; import com.achobeta.domain.users.model.converter.MemberConverter; +import com.achobeta.domain.users.model.converter.UserConverter; import com.achobeta.domain.users.model.dao.mapper.MemberMapper; import com.achobeta.domain.users.model.dto.MemberDTO; import com.achobeta.domain.users.model.entity.Member; import com.achobeta.domain.users.model.vo.MemberVO; import com.achobeta.domain.users.model.vo.SimpleMemberVO; -import com.achobeta.domain.users.service.MemberService; -import com.achobeta.domain.student.model.dto.QueryResumeDTO; -import com.achobeta.domain.student.model.vo.StuResumeVO; -import com.achobeta.domain.student.service.StuResumeService; -import com.achobeta.domain.users.model.converter.UserConverter; import com.achobeta.domain.users.model.vo.UserVO; +import com.achobeta.domain.users.service.MemberService; import com.achobeta.domain.users.service.UserService; import com.achobeta.exception.GlobalServiceException; import com.achobeta.redis.RedisLock; diff --git a/src/main/java/com/achobeta/template/engine/MarkdownEngine.java b/src/main/java/com/achobeta/template/engine/MarkdownEngine.java index f8ef4647..dde4b261 100644 --- a/src/main/java/com/achobeta/template/engine/MarkdownEngine.java +++ b/src/main/java/com/achobeta/template/engine/MarkdownEngine.java @@ -1,6 +1,5 @@ package com.achobeta.template.engine; -import com.achobeta.template.model.po.HtmlReplaceResource; import com.achobeta.template.model.po.MarkdownReplaceResource; import com.achobeta.template.model.po.MarkdownResource; import com.achobeta.template.util.TemplateUtil; diff --git a/src/main/java/com/achobeta/util/ObjectUtil.java b/src/main/java/com/achobeta/util/ObjectUtil.java index 90af155c..866ff04f 100644 --- a/src/main/java/com/achobeta/util/ObjectUtil.java +++ b/src/main/java/com/achobeta/util/ObjectUtil.java @@ -45,7 +45,7 @@ public static F read(C object, Field field, Class fieldClazz) { } } - // 滤出 C 类内部不包括父类的字段列表中，「F/F子类的属性」若 + // 滤出 C 类内部不包括父类的字段列表中，「可通过字段或者 Getter 访问的 F/F子类的属性」，其他均为 null public static Stream stream(C object, Class fieldClazz) { return Arrays.stream(object.getClass().getDeclaredFields()) .map(field -> read(object, field, fieldClazz));