From d1ab94084e68263e2261d1ddb027898d709c58e5 Mon Sep 17 00:00:00 2001 From: zhangchenbiao Date: Tue, 19 Mar 2024 18:04:42 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E9=9D=A2=E8=B0=88/=E9=9D=A2=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cool/store/enums/WorkflowStatusEnum.java | 51 ------------------- .../dto/interview/LineInterviewPageDTO.java | 3 ++ .../vo/interview/LineInterviewPageVO.java | 4 ++ .../store/config/TokenValidateFilter.java | 2 +- 4 files changed, 8 insertions(+), 52 deletions(-) delete mode 100644 coolstore-partner-common/src/main/java/com/cool/store/enums/WorkflowStatusEnum.java diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/WorkflowStatusEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/WorkflowStatusEnum.java deleted file mode 100644 index 9389e8939..000000000 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/WorkflowStatusEnum.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.cool.store.enums; - -/** - * @Author suzhuhong - * @Date 2023/6/9 16:35 - * @Version 1.0 - */ -public enum WorkflowStatusEnum { - //意向申请阶段 - INTENT_0("0","待提交"), - INTENT_1("1","待审核"), - INTENT_2("2","已通过"), - INTENT_3("3","未通过"), - - //预约面试阶段 - RESERVATION_0("0","待预约"), - RESERVATION_1("1","待审核"), - RESERVATION_7("7","拒绝"), - RESERVATION_8("8","超时"),//超时未预约或未参加 - - - //合格资格面试 - INTERVIEW_2("2","待面试"), - INTERVIEW_3("3","已开始"), - INTERVIEW_4("4","待审核"), - INTERVIEW_5("5","审核中"), - INTERVIEW_6("6","审核通过"), - INTERVIEW_7("7","拒绝"), - - - ; - - private String code; - - private String message; - - WorkflowStatusEnum(String code, String message) { - this.code = code; - this.message = message; - } - - - public String getCode() { - return code; - } - - public String getMessage() { - return message; - } - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/interview/LineInterviewPageDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/interview/LineInterviewPageDTO.java index a29fa39d0..a3600b493 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/interview/LineInterviewPageDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/interview/LineInterviewPageDTO.java @@ -51,4 +51,7 @@ public class LineInterviewPageDTO { @ApiModelProperty("面审人") private String interviewer; + @ApiModelProperty("房间id") + private String roomId; + } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/interview/LineInterviewPageVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/interview/LineInterviewPageVO.java index 12e597220..dc89a6f26 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/interview/LineInterviewPageVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/interview/LineInterviewPageVO.java @@ -60,6 +60,9 @@ public class LineInterviewPageVO { @ApiModelProperty("面审人") private String interviewerUsername; + @ApiModelProperty("房间id") + private String roomId; + public static List convertList(List list, Map userPortraitMap, Map userNameMap, Map cityNameMap){ if(CollectionUtils.isEmpty(list)){ return Lists.newArrayList(); @@ -93,6 +96,7 @@ public class LineInterviewPageVO { } result.setUserPortraitList(userPortraitList); } + result.setRoomId(lineInterviewPage.getRoomId()); resultList.add(result); } return resultList; diff --git a/coolstore-partner-web/src/main/java/com/cool/store/config/TokenValidateFilter.java b/coolstore-partner-web/src/main/java/com/cool/store/config/TokenValidateFilter.java index 1ab22caa8..1cbbb37b7 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/config/TokenValidateFilter.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/config/TokenValidateFilter.java @@ -126,7 +126,7 @@ public class TokenValidateFilter implements Filter { // CurrentUserHolder.removeUser(); // MDC.clear(); // } - filterChain.doFilter(servletRequest, servletResponse); + //filterChain.doFilter(servletRequest, servletResponse); } @Override From a2a58c57a102f3a1f9cd39dbdc4eefbad9205bde Mon Sep 17 00:00:00 2001 From: zhangchenbiao Date: Wed, 20 Mar 2024 11:44:29 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E9=9D=A2=E8=B0=88/=E9=9D=A2=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cool/store/enums/InterviewTypeEnum.java | 6 -- .../store/enums/InterviewUserTypeEnum.java | 23 +++++++ .../store/enums/JoinInterviewStatusEnum.java | 45 +++++++++++++ .../java/com/cool/store/utils/TRTCUtils.java | 4 +- .../java/com/cool/store/dao/LineInfoDAO.java | 6 +- .../com/cool/store/dao/LineInterviewDAO.java | 9 +++ .../resources/mapper/LineInterviewMapper.xml | 3 +- .../dto/interview/LineInterviewPageDTO.java | 3 + .../cool/store/entity/LineInterviewDO.java | 6 +- .../store/vo/interview/EnterInterviewVO.java | 27 ++++++++ .../vo/interview/LineInterviewPageVO.java | 3 + .../store/service/LineInterviewService.java | 11 ++++ .../impl/LineInterviewServiceImpl.java | 38 ++++++++++- .../webb/LineInterviewController.java | 66 +++++++++++++++++++ .../webc/LineInterviewController.java | 25 +++---- 15 files changed, 244 insertions(+), 31 deletions(-) create mode 100644 coolstore-partner-common/src/main/java/com/cool/store/enums/InterviewUserTypeEnum.java create mode 100644 coolstore-partner-common/src/main/java/com/cool/store/enums/JoinInterviewStatusEnum.java create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/vo/interview/EnterInterviewVO.java create mode 100644 coolstore-partner-web/src/main/java/com/cool/store/controller/webb/LineInterviewController.java diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/InterviewTypeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/InterviewTypeEnum.java index 8ca7b4173..2fe72d9e1 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/InterviewTypeEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/InterviewTypeEnum.java @@ -1,7 +1,6 @@ package com.cool.store.enums; import com.cool.store.constants.CommonConstants; -import org.apache.commons.collections4.ListUtils; import org.apache.commons.lang3.tuple.Pair; import java.time.LocalDate; @@ -9,7 +8,6 @@ import java.time.LocalDateTime; import java.time.LocalTime; import java.util.ArrayList; import java.util.List; -import java.util.Map; /** * @author zhangchenbiao @@ -93,8 +91,4 @@ public enum InterviewTypeEnum { return result; } - public static void main(String[] args) { - System.out.println(getTimeSlots(LocalDate.now(), InterviewTypeEnum.INTERVIEW)); - } - } diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/InterviewUserTypeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/InterviewUserTypeEnum.java new file mode 100644 index 000000000..1572788c9 --- /dev/null +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/InterviewUserTypeEnum.java @@ -0,0 +1,23 @@ +package com.cool.store.enums; + +/** + * @author zhangchenbiao + * @FileName: InterviewUserTypeEnum + * @Description: + * @date 2024-03-20 9:53 + */ +public enum InterviewUserTypeEnum { + + LINE("加盟商线索"), + INTERVIEWER("面试官"),; + + private String message; + + InterviewUserTypeEnum(String message) { + this.message = message; + } + + public String getMessage() { + return message; + } +} diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/JoinInterviewStatusEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/JoinInterviewStatusEnum.java new file mode 100644 index 000000000..a8c7bed47 --- /dev/null +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/JoinInterviewStatusEnum.java @@ -0,0 +1,45 @@ +package com.cool.store.enums; + +/** + * @author zhangchenbiao + * @FileName: JoinInterviewStatusEnum + * @Description: + * @date 2024-03-20 11:05 + */ +public enum JoinInterviewStatusEnum { + + NO_JOIN(0, "未参加"), + LINE_JOIN(1,"加盟商先进入"), + INTERVIEW_JOIN(2,"面试官先进入"), + JOIN(3,"双方都参加"); + + private Integer code; + + private String message; + + JoinInterviewStatusEnum(Integer code, String message) { + this.code = code; + this.message = message; + } + + public Integer getCode() { + return code; + } + + public String getMessage() { + return message; + } + + public static Integer getJoinInterviewStatus(Integer joinInterviewStatus, InterviewUserTypeEnum userType){ + if(NO_JOIN.getCode().equals(joinInterviewStatus)){ + return InterviewUserTypeEnum.LINE.equals(userType) ? LINE_JOIN.getCode() : INTERVIEW_JOIN.getCode(); + } + if(LINE_JOIN.getCode().equals(joinInterviewStatus)){ + return InterviewUserTypeEnum.LINE.equals(userType) ? LINE_JOIN.getCode() : JOIN.getCode(); + } + if(INTERVIEW_JOIN.getCode().equals(joinInterviewStatus)){ + return InterviewUserTypeEnum.LINE.equals(userType) ? JOIN.getCode() : INTERVIEW_JOIN.getCode(); + } + return JOIN.getCode(); + } +} diff --git a/coolstore-partner-common/src/main/java/com/cool/store/utils/TRTCUtils.java b/coolstore-partner-common/src/main/java/com/cool/store/utils/TRTCUtils.java index e71b6cbd6..f90194b95 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/utils/TRTCUtils.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/utils/TRTCUtils.java @@ -16,10 +16,10 @@ public class TRTCUtils { */ private static final Long expired = 60 * 60 * 24L; - @Value("${trtc.sdkAppId:null}") + @Value("${trtc.sdkAppId}") private Long sdkAppId; - @Value("${trtc.secretKey:null}") + @Value("${trtc.secretKey}") private String key; /** diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/LineInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/LineInfoDAO.java index ac6cc170f..c6168e02d 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/LineInfoDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/LineInfoDAO.java @@ -23,7 +23,11 @@ public class LineInfoDAO { public LineInfoDO getLineInfo(Long lineId) { - return lineInfoMapper.selectByPrimaryKey(lineId); + LineInfoDO lineInfo = lineInfoMapper.selectByPrimaryKey(lineId); + if(Objects.nonNull(lineInfo) && !lineInfo.getDeleted()){ + return lineInfo; + } + return null; } public Integer updateLineInfo(LineInfoDO param){ diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/LineInterviewDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/LineInterviewDAO.java index 6c148178e..71218573e 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/LineInterviewDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/LineInterviewDAO.java @@ -51,4 +51,13 @@ public class LineInterviewDAO { return lineInterviewMapper.getInterviewerPage(request); } + /** + * 获取面试信息 + * @param interviewId + * @return + */ + public LineInterviewDO getInterviewInfoById(Long interviewId){ + return lineInterviewMapper.selectByPrimaryKey(interviewId); + } + } diff --git a/coolstore-partner-dao/src/main/resources/mapper/LineInterviewMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/LineInterviewMapper.xml index 0a962590c..da115456f 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/LineInterviewMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/LineInterviewMapper.xml @@ -9,7 +9,7 @@ - + @@ -32,6 +32,7 @@