From 765f6574f082a09b84eefdf3e874c74d6fb92ee6 Mon Sep 17 00:00:00 2001 From: "feng.li" Date: Tue, 12 Dec 2023 18:54:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=87=AA=E5=8A=A8=E6=89=93?= =?UTF-8?q?=E5=BC=80=E9=9D=A2=E8=AF=95=E6=88=BF=E9=97=B4=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/log/AutoOpenInterviewRoomDTO.java | 16 +++++ .../store/service/impl/CommonServiceImpl.java | 1 + .../HyPartnerInterviewPlanServiceImpl.java | 17 ++++- .../store/service/HyPartnerInterviewTest.java | 71 +++++++++++++++++++ 4 files changed, 102 insertions(+), 3 deletions(-) create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/dto/log/AutoOpenInterviewRoomDTO.java create mode 100644 coolstore-partner-webb/src/test/java/com/cool/store/service/HyPartnerInterviewTest.java diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/log/AutoOpenInterviewRoomDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/log/AutoOpenInterviewRoomDTO.java new file mode 100644 index 000000000..e45e6fdf0 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/log/AutoOpenInterviewRoomDTO.java @@ -0,0 +1,16 @@ +package com.cool.store.dto.log; + +import lombok.Builder; +import lombok.Data; + +/** + * @author Fun Li 2023/12/12 17:53 + * @version 1.0 + */ +@Data +@Builder +public class AutoOpenInterviewRoomDTO { + + private String operateTime; + +} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/CommonServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/CommonServiceImpl.java index 99d140e0f..3fd093178 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/CommonServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/CommonServiceImpl.java @@ -87,6 +87,7 @@ public class CommonServiceImpl implements CommonService { //3. 面试已开始 } else if (workflowStage.equals(WorkflowStageEnum.INTERVIEW.getCode()) && workflowStatus.equals(WorkflowStatusEnum.INTERVIEW_3.getCode())) { interviewTips = getInterviewTips(partnerLineId, OperateTypeEnum.AUTO_OPEN_INTERVIEW, "面试房间于", "正式开放"); + interviewTips = interviewTips.trim(); //4. 面试已结束 } else if (workflowStage.equals(WorkflowStageEnum.INTERVIEW.getCode()) && workflowStatus.equals(WorkflowStatusEnum.INTERVIEW_4.getCode())) { interviewTips = getInterviewTips(partnerLineId, OperateTypeEnum.FINISH_INTERVIEW, "于", "结束面试"); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerInterviewPlanServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerInterviewPlanServiceImpl.java index b1d05c896..496ee202f 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerInterviewPlanServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerInterviewPlanServiceImpl.java @@ -2,16 +2,16 @@ package com.cool.store.service.impl; import cn.hutool.core.date.DateUtil; import com.cool.store.constants.CommonConstants; +import com.cool.store.context.CurrentUserHolder; +import com.cool.store.context.LoginUserInfo; import com.cool.store.dao.*; +import com.cool.store.dto.log.AutoOpenInterviewRoomDTO; import com.cool.store.dto.message.RemindInterviewMsgDTO; -import com.cool.store.dto.message.SendCardMessageDTO; -import com.cool.store.dto.partner.PartnerIntentApplyInfoDTO; import com.cool.store.dto.partner.PartnerInterviewInfoDTO; import com.cool.store.entity.*; import com.cool.store.enums.*; import com.cool.store.exception.ApiException; import com.cool.store.http.EventCenterHttpRequest; -import com.cool.store.http.ISVHttpRequest; import com.cool.store.mapper.HyPartnerInterviewMapper; import com.cool.store.mapper.HyPartnerInterviewPlanMapper; import com.cool.store.mapper.HyPartnerLineInfoMapper; @@ -99,6 +99,9 @@ public class HyPartnerInterviewPlanServiceImpl implements HyPartnerInterviewPlan @Autowired private WechatMiniAppService wechatMiniAppService; + @Autowired + private LogService logService; + @Override public List getInterviewPlanList(String userId,Date dateTime) { String currentDay = DateUtil.format(dateTime, CoolDateUtils.DATE_FORMAT_DAY); @@ -266,6 +269,14 @@ public class HyPartnerInterviewPlanServiceImpl implements HyPartnerInterviewPlan List lineIds = waitForOpenInterviewLineList.stream().map(HyPartnerLineInfoDO::getId).collect(Collectors.toList()); hyPartnerInterviewPlanMapper.openInterviewRoom(lineIds,RoomStatus.OPEN.getCode()); interviewDAO.batchUpdateInterviewWorkflowStatus(lineIds,Integer.parseInt(WorkflowStatusEnum.INTERVIEW_3.getCode())); + + //记录日志 + LoginUserInfo user = CurrentUserHolder.getUser(); + AutoOpenInterviewRoomDTO autoOpenInterviewRoomLog = AutoOpenInterviewRoomDTO.builder() + .operateTime(DateUtil.now()).build(); + for (Long lineId : lineIds) { + logService.recordBizLog(user, lineId, OperateTypeEnum.AUTO_OPEN_INTERVIEW, autoOpenInterviewRoomLog); + } } @Override diff --git a/coolstore-partner-webb/src/test/java/com/cool/store/service/HyPartnerInterviewTest.java b/coolstore-partner-webb/src/test/java/com/cool/store/service/HyPartnerInterviewTest.java new file mode 100644 index 000000000..d564416b0 --- /dev/null +++ b/coolstore-partner-webb/src/test/java/com/cool/store/service/HyPartnerInterviewTest.java @@ -0,0 +1,71 @@ +package com.cool.store.service; + +import cn.hutool.core.date.DateUtil; +import com.cool.store.context.CurrentUserHolder; +import com.cool.store.context.LoginUserInfo; +import com.cool.store.dao.HyInterviewDAO; +import com.cool.store.dto.log.AutoOpenInterviewRoomDTO; +import com.cool.store.enums.OperateTypeEnum; +import com.cool.store.enums.RoomStatus; +import com.cool.store.enums.WorkflowStatusEnum; +import com.cool.store.exception.ApiException; +import com.cool.store.mapper.HyPartnerInterviewPlanMapper; +import com.cool.store.mapper.HyPartnerLineInfoMapper; +import com.cool.store.request.GetTipsInfoReq; +import lombok.extern.slf4j.Slf4j; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests; + +import java.util.Arrays; +import java.util.List; + +/** + * @author Fun Li 2023/12/12 18:07 + * @version 1.0 + */ +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) +@Slf4j +class HyPartnerInterviewTest extends AbstractJUnit4SpringContextTests { + + @Autowired + private HyPartnerInterviewPlanService hyPartnerInterviewPlanService; + + @Autowired + private HyPartnerLineInfoMapper hyPartnerLineInfoMapper; + + @Autowired + private HyPartnerInterviewPlanMapper hyPartnerInterviewPlanMapper; + + @Autowired + private HyInterviewDAO interviewDAO; + + @Autowired + private LogService logService; + + @Autowired + private CommonService commonService; + + @Test + void testOpenInterviewRoom() throws ApiException { + //更新房间状态为开启 + List lineIds = Arrays.asList(38711L); + hyPartnerInterviewPlanMapper.openInterviewRoom(lineIds, RoomStatus.OPEN.getCode()); + interviewDAO.batchUpdateInterviewWorkflowStatus(lineIds,Integer.parseInt(WorkflowStatusEnum.INTERVIEW_3.getCode())); + + //记录日志 + LoginUserInfo user = CurrentUserHolder.getUser(); + AutoOpenInterviewRoomDTO autoOpenInterviewRoomLog = AutoOpenInterviewRoomDTO.builder() + .operateTime(DateUtil.now()).build(); + for (Long lineId : lineIds) { + logService.recordBizLog(user, lineId, OperateTypeEnum.AUTO_OPEN_INTERVIEW, autoOpenInterviewRoomLog); + } + + GetTipsInfoReq getTipsInfoReq = new GetTipsInfoReq(); + getTipsInfoReq.setPartnerLineId(lineIds.get(0).toString()); + String tipsInfo = commonService.getTipsInfo(getTipsInfoReq); + log.info("tipsInfo:{}", tipsInfo); + } + +}