日志相关

2023-06-28 15:13:19 +08:00
parent 5ae5d166dd
commit ebdc60de1a
16 changed files with 346 additions and 19 deletions
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/InterviewService.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/InterviewService.java
@@ -68,4 +68,6 @@ public interface InterviewService {
    public String getInterviewerByPartner(String partnerId,String lineId)throws ApiException;

    public void rejectInterviewAndSuspendLine(Long iterviewId,Long interviewPlanId,String certifyFile);
+
+    void getLastUpdateTimeInfo(GetLastUpdateTimeInfoReq request) throws ApiException;
 }
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/LogService.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/LogService.java
@@ -0,0 +1,16 @@
+package com.cool.store.service;
+
+import com.cool.store.context.LoginUserInfo;
+import com.cool.store.enums.OperateTypeEnum;
+import com.cool.store.vo.PartnerUserInfoVO;
+
+/**
+ * @Author: young.yu
+ * @Date: 2023-06-28  00:10
+ * @Description:
+ */
+public interface LogService {
+
+    public  void recordBizLog(LoginUserInfo operator, Long lineId, OperateTypeEnum operateTypeEnum, Object logData);
+    public  void recordPartnerBizLog(PartnerUserInfoVO operator , Long lineId, OperateTypeEnum operateTypeEnum, Object logData);
+}
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java
@@ -6,12 +6,17 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
 import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.cool.store.context.CurrentUserHolder;
+import com.cool.store.context.LoginUserInfo;
 import com.cool.store.dao.EnterpriseUserDAO;
 import com.cool.store.dao.HyInterviewDAO;
+import com.cool.store.dto.log.CreateQualifyVerifyDTO;
+import com.cool.store.dto.log.ReInterviewDTO;
 import com.cool.store.dto.mdm.AccessTokenDTO;
 import com.cool.store.dto.response.MDMResultDTO;
 import com.cool.store.entity.*;
 import com.cool.store.enums.ErrorCodeEnum;
+import com.cool.store.enums.OperateTypeEnum;
 import com.cool.store.enums.WorkflowStatusEnum;
 import com.cool.store.exception.ApiException;
 import com.cool.store.exception.ServiceException;
@@ -27,10 +32,8 @@ import com.cool.store.request.RpcGetMdmTokenReq;
 import com.cool.store.request.data.flow.KeyText;
 import com.cool.store.request.data.flow.SkrRelshipProve;
 import com.cool.store.service.FlowService;
-import com.cool.store.utils.PDFUtils;
-import com.cool.store.utils.PassLetterUtils;
-import com.cool.store.utils.RedisUtilPool;
-import com.cool.store.utils.RestTemplateUtil;
+import com.cool.store.service.LogService;
+import com.cool.store.utils.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -90,6 +93,8 @@ public class FlowServiceImpl implements FlowService {
    @Autowired
    private HyInterviewDAO interviewDAO;

+    @Autowired
+    private LogService logService;
    @Override
    @Transactional
    public void createQualifyVerify(CreateQualifyVerifyReq request) throws ApiException, IOException {
@@ -198,6 +203,11 @@ public class FlowServiceImpl implements FlowService {
            hyPartnerLineInfoDO.setDevelopmentDirector(request.getDevtDirectorId());
            hyPartnerLineInfoMapper.updateByPrimaryKeySelective(hyPartnerLineInfoDO);
        }
+        //记录日志
+        LoginUserInfo operator = CurrentUserHolder.getUser();
+        CreateQualifyVerifyDTO log = CreateQualifyVerifyDTO.builder().operateUserId(operator.getUserId()).operateUsername(operator.getName()).operateTime(DateUtil.format(new Date(), CoolDateUtils.DATE_FORMAT_SEC))
+                .summary(request.getSummary()).qualiVerifyContent(JSON.toJSONString(partnerCertificationInfoDO)).build();
+        logService.recordBizLog(operator,hyPartnerInterviewDO.getPartnerLineId(), OperateTypeEnum.CREATE_QUALIFYVERIFY,log);
    }

    @Override
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewServiceImpl.java
@@ -6,8 +6,20 @@ import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
+import com.cool.store.context.CurrentUserHolder;
+import com.cool.store.context.LoginUserInfo;
+import com.cool.store.context.PartnerUserHolder;
+import com.cool.store.dao.EnterpriseUserDAO;
 import com.cool.store.dao.HyInterviewDAO;
-import com.cool.store.dto.calendar.*;
+import com.cool.store.dao.HyPartnerTaskInfoLogDAO;
+import com.cool.store.dto.calendar.CreateCalendarEventDTO;
+import com.cool.store.dto.calendar.DeleteCalendarEventDTO;
+import com.cool.store.dto.calendar.UserCalendarsEventDTO;
+import com.cool.store.dto.calendar.UserFreeBusyInfoDTO;
+import com.cool.store.dto.log.EntrustOthersDTO;
+import com.cool.store.dto.log.LogBasicDTO;
+import com.cool.store.dto.log.ModifyInterviewTimeDTO;
+import com.cool.store.dto.log.ReInterviewDTO;
 import com.cool.store.dto.message.SendCardMessageDTO;
 import com.cool.store.dto.partner.EnterInterviewDto;
 import com.cool.store.entity.*;
@@ -15,19 +27,18 @@ import com.cool.store.enums.*;
 import com.cool.store.exception.ApiException;
 import com.cool.store.exception.ServiceException;
 import com.cool.store.http.ISVHttpRequest;
-import com.cool.store.mapper.HyPartnerBaseInfoMapper;
-import com.cool.store.mapper.HyPartnerInterviewMapper;
-import com.cool.store.mapper.HyPartnerInterviewPlanMapper;
-import com.cool.store.mapper.HyPartnerLineInfoMapper;
+import com.cool.store.mapper.*;
 import com.cool.store.request.*;
 import com.cool.store.service.EnterpriseUserService;
-import com.cool.store.service.HyPartnerLineInfoService;
 import com.cool.store.service.InterviewService;
+import com.cool.store.service.LogService;
 import com.cool.store.service.SmsService;
+import com.cool.store.utils.CoolDateUtils;
 import com.cool.store.utils.StringUtil;
 import com.cool.store.utils.TRTCUtils;
 import com.cool.store.vo.EnterInterviewVO;
 import com.cool.store.vo.EnterpriseUserBaseInfoVO;
+import com.cool.store.vo.PartnerUserInfoVO;
 import com.cool.store.vo.interview.CreateAppointmentVO;
 import com.cool.store.vo.interview.InterviewVO;
 import lombok.extern.slf4j.Slf4j;
@@ -85,12 +96,17 @@ public class InterviewServiceImpl implements InterviewService {
    @Autowired
    private SmsService smsService;

-    @Autowired
-    private HyPartnerLineInfoService hyPartnerLineInfoService;
-
    @Autowired
    private HyInterviewDAO interviewDAO;

+    @Autowired
+    private LogService logService;
+
+    @Autowired
+    private EnterpriseUserDAO enterpriseUserDAO;
+
+    @Autowired
+    private HyPartnerTaskInfoLogMapper hyPartnerTaskInfoLogMapper;
    @Override
    public List<InterviewVO> getInterviewList(GetInterviewListReq request) {
        List<InterviewVO> interviewList = hyPartnerInterviewPlanMapper.getInterviewList(request);
@@ -188,6 +204,16 @@ public class InterviewServiceImpl implements InterviewService {
        hyPartnerInterviewDO.setUpdateTime(new Date());
        hyPartnerInterviewMapper.updateByPrimaryKeySelective(hyPartnerInterviewDO);

+        //记录日志
+        LoginUserInfo operator = CurrentUserHolder.getUser();
+        EnterpriseUserDO enterpriseUserDO = enterpriseUserDAO.getUserInfoById(request.getNewInterviewerId());
+        EntrustOthersDTO log = EntrustOthersDTO.builder().operateUserId(operator.getUserId()).operateUsername(operator.getName())
+                .operateTime(DateUtil.format(new Date(), CoolDateUtils.DATE_FORMAT_SEC))
+                .beforeInterviwerMobile(interviewInfo.getInterviewerMobile())
+                .beforeInterviwerName(interviewInfo.getInterviewerName())
+                .afterInterviwerMobile(enterpriseUserDO.getMobile())
+                .afterInterviwerName(enterpriseUserDO.getName()).build();
+        logService.recordBizLog(operator,interviewInfo.getPartnerLineId(),OperateTypeEnum.ENTRUST_OTHERS,log);
    }

    /**
@@ -248,6 +274,13 @@ public class InterviewServiceImpl implements InterviewService {
        hyPartnerInterviewDO.setInterviewer(interviewInfo.getInterviewerId());
        hyPartnerInterviewDO.setUpdateTime(new Date());
        hyPartnerInterviewMapper.updateByPrimaryKeySelective(hyPartnerInterviewDO);
+
+        //记录日志
+        PartnerUserInfoVO operator = PartnerUserHolder.getUser();
+        ModifyInterviewTimeDTO log = ModifyInterviewTimeDTO.builder().operateUserId(operator.getPartnerId()).operateUsername(operator.getUsername())
+                .operateTime(DateUtil.format(new Date(), CoolDateUtils.DATE_FORMAT_SEC))
+                .beforeInterviewTime(interviewInfo.getStartTime()).afterInterviewTime(request.getNewStartBookingTime()).build();
+        logService.recordPartnerBizLog(operator,interviewInfo.getPartnerLineId(),OperateTypeEnum.MODIFY_INTERVIEW_TIME,log);
    }

    @Override
@@ -273,6 +306,11 @@ public class InterviewServiceImpl implements InterviewService {
 //        hyPartnerInterviewDO.setStatus(Integer.parseInt(WorkflowStatusEnum.INTERVIEW_4.getCode()));
        hyPartnerInterviewDO.setUpdateTime(now);
        hyPartnerInterviewMapper.updateByPrimaryKeySelective(hyPartnerInterviewDO);
+
+        //记录日志
+        LoginUserInfo operator = CurrentUserHolder.getUser();
+        LogBasicDTO log = LogBasicDTO.builder().operateUserId(operator.getUserId()).operateUsername(operator.getName()).operateTime(DateUtil.format(new Date(), CoolDateUtils.DATE_FORMAT_SEC)).build();
+        logService.recordBizLog(operator,interviewInfo.getPartnerLineId(),OperateTypeEnum.FINISH_INTERVIEW,log);
    }

    /**
@@ -419,6 +457,12 @@ public class InterviewServiceImpl implements InterviewService {
        sendCardMessageDTO.setTitle("面试预约申请");
        sendCardMessageDTO.setContent(generateFeiShuInterviewMsg(interviewVO.getPartnerName(), interviewVO.getPartnerMobile(), interviewVO.getStartTime()));
        isvHttpRequest.sendFeiShuCardMessage(sendCardMessageDTO);
+
+        //记录日志
+        PartnerUserInfoVO operator = PartnerUserHolder.getUser();
+        LogBasicDTO log = LogBasicDTO.builder().operateUserId(operator.getPartnerId()).operateUsername(operator.getUsername()).operateTime(DateUtil.format(new Date(), CoolDateUtils.DATE_FORMAT_SEC)).build();
+        logService.recordPartnerBizLog(operator,interviewVO.getPartnerLineId(),OperateTypeEnum.INTERVIEW_APPOINTMENT,log);
+
        return vo;
    }

@@ -501,6 +545,11 @@ public class InterviewServiceImpl implements InterviewService {
        hyPartnerLineDO.setWorkflowStatus(WorkflowStatusEnum.RESERVATION_0.getCode());
        hyPartnerLineDO.setUpdateTime(new Date());
        hyPartnerLineInfoMapper.updateByPrimaryKeySelective(hyPartnerLineDO);
+        //记录日志
+        LoginUserInfo operator = CurrentUserHolder.getUser();
+        ReInterviewDTO log = ReInterviewDTO.builder().operateUserId(operator.getUserId()).operateUsername(operator.getName()).operateTime(DateUtil.format(new Date(), CoolDateUtils.DATE_FORMAT_SEC))
+                .rejectRealReason(request.getReason()).certifyFile(request.getCertifyFile()).build();
+        logService.recordBizLog(operator,interviewVO.getPartnerLineId(),OperateTypeEnum.REINTERVIEW,log);
    }

 //    @Override
@@ -582,4 +631,9 @@ public class InterviewServiceImpl implements InterviewService {
        hyPartnerInterviewPlanMapper.updateByPrimaryKeySelective(hyPartnerInterviewPlanDO);
    }

+    @Override
+    public void getLastUpdateTimeInfo(GetLastUpdateTimeInfoReq request) throws ApiException {
+
+    }
+
 }
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LogServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LogServiceImpl.java
@@ -0,0 +1,83 @@
+package com.cool.store.service.impl;
+
+import cn.hutool.core.date.DateUtil;
+import com.cool.store.context.LoginUserInfo;
+import com.cool.store.dao.HyPartnerTaskInfoLogDAO;
+import com.cool.store.dto.log.LineLogInfo;
+import com.cool.store.dto.log.LogBasicDTO;
+import com.cool.store.entity.HyPartnerLineInfoDO;
+import com.cool.store.enums.OperateTypeEnum;
+import com.cool.store.enums.WorkflowStageEnum;
+import com.cool.store.enums.WorkflowStatusEnum;
+import com.cool.store.mapper.HyPartnerLineInfoMapper;
+import com.cool.store.service.LogService;
+import com.cool.store.utils.CoolDateUtils;
+import com.cool.store.utils.Md5Utils;
+import com.cool.store.vo.PartnerUserInfoVO;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Author: young.yu
+ * @Date: 2023-06-28  00:10
+ * @Description:
+ */
+@Service
+public class LogServiceImpl implements LogService {
+    private static final Logger LOG = LoggerFactory.getLogger(Md5Utils.class);
+
+    @Autowired
+    private HyPartnerLineInfoMapper partnerLineInfoMapper;
+    @Autowired
+    private HyPartnerTaskInfoLogDAO hyPartnerTaskInfoLogDAO;
+
+    @Override
+    @Async
+    public  void recordBizLog(LoginUserInfo operator,Long lineId,OperateTypeEnum operateTypeEnum,Object logData){
+        try {
+            List<HyPartnerLineInfoDO> lineInfos = partnerLineInfoMapper.getHyPartnerLineInfoListByIds(Arrays.asList(lineId));
+            if (lineInfos == null || lineInfos.size() == 0) {
+                return;
+            }
+            HyPartnerLineInfoDO hyPartnerLineInfoDO = lineInfos.get(0);
+            LineLogInfo lineLogInfo = new LineLogInfo(hyPartnerLineInfoDO.getPartnerId(), lineId, operator.getUserId(),
+                    operator.getName(), operateTypeEnum,
+                    WorkflowStageEnum.getWorkflowStageByCode(hyPartnerLineInfoDO.getWorkflowStage()),
+                    hyPartnerLineInfoDO.getWorkflowStatus(), "");
+            lineLogInfo.setData(logData);
+            hyPartnerTaskInfoLogDAO.addOperateLog(lineLogInfo);
+            int i =1;
+        }catch (Exception e){
+            LOG.error("recordBizLog error",e);
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    @Async
+    public  void recordPartnerBizLog(PartnerUserInfoVO operator, Long lineId, OperateTypeEnum operateTypeEnum, Object logData){
+        try {
+            List<HyPartnerLineInfoDO> lineInfos = partnerLineInfoMapper.getHyPartnerLineInfoListByIds(Arrays.asList(lineId));
+            if (lineInfos == null || lineInfos.size() == 0) {
+                return;
+            }
+            HyPartnerLineInfoDO hyPartnerLineInfoDO = lineInfos.get(0);
+            LineLogInfo lineLogInfo = new LineLogInfo(hyPartnerLineInfoDO.getPartnerId(), lineId, operator.getPartnerId(),
+                    operator.getUsername(), operateTypeEnum,
+                    WorkflowStageEnum.getWorkflowStageByCode(hyPartnerLineInfoDO.getWorkflowStage()),
+                    hyPartnerLineInfoDO.getWorkflowStatus(), "");
+            lineLogInfo.setData(logData);
+            hyPartnerTaskInfoLogDAO.addOperateLog(lineLogInfo);
+        }catch (Exception e){
+            LOG.error("recordBizLog error",e);
+            e.printStackTrace();
+        }
+    }
+}
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/workflow/InterviewWorkFlowService.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/workflow/InterviewWorkFlowService.java
@@ -1,14 +1,15 @@
 package com.cool.store.service.impl.workflow;

 import cn.hutool.core.date.DateUtil;
+import com.cool.store.context.CurrentUserHolder;
+import com.cool.store.context.LoginUserInfo;
 import com.cool.store.dto.calendar.CreateCalendarEventDTO;
 import com.cool.store.dto.calendar.DeleteCalendarEventDTO;
 import com.cool.store.dto.calendar.UserCalendarsEventDTO;
+import com.cool.store.dto.log.ReInterviewDTO;
+import com.cool.store.dto.log.RejectInterviewDTO;
 import com.cool.store.entity.HyPartnerInterviewDO;
-import com.cool.store.enums.ErrorCodeEnum;
-import com.cool.store.enums.RoomStatus;
-import com.cool.store.enums.WorkflowStageEnum;
-import com.cool.store.enums.WorkflowStatusEnum;
+import com.cool.store.enums.*;
 import com.cool.store.exception.ApiException;
 import com.cool.store.exception.ServiceException;
 import com.cool.store.http.ISVHttpRequest;
@@ -18,6 +19,8 @@ import com.cool.store.request.CloseFollowRequest;
 import com.cool.store.request.EntrustOthersReq;
 import com.cool.store.request.TransferInvestmentManagerRequest;
 import com.cool.store.service.InterviewService;
+import com.cool.store.service.LogService;
+import com.cool.store.utils.CoolDateUtils;
 import com.cool.store.vo.interview.InterviewVO;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
@@ -49,6 +52,9 @@ public class InterviewWorkFlowService extends WorkFlowBaseService {

    @Autowired
    private ISVHttpRequest isvHttpRequest;
+
+    @Autowired
+    private LogService logService;
    @Override
    public WorkflowStageEnum getWorkFlowStage() {
        return WorkflowStageEnum.RESERVATION;
@@ -64,6 +70,11 @@ public class InterviewWorkFlowService extends WorkFlowBaseService {
        }
        HyPartnerInterviewDO interviewBaseInfo = interviewBaseInfos.get(0);
        interviewService.rejectInterviewAndSuspendLine(interviewBaseInfo.getId(),interviewBaseInfo.getInterviewPlanId(),null);
+        //记录日志
+        LoginUserInfo operator = CurrentUserHolder.getUser();
+        RejectInterviewDTO log = RejectInterviewDTO.builder().operateUserId(operator.getUserId()).operateUsername(operator.getName()).operateTime(DateUtil.format(new Date(), CoolDateUtils.DATE_FORMAT_SEC))
+                .rejectRealReason(request.getRejectRealReason()).rejectPublicReason(request.getRejectPublicReason()).certifyFile(request.getCertifyFile()).build();
+        logService.recordBizLog(operator,request.getLineId(), OperateTypeEnum.REJECT_INTERVIEW,log);
    }

    @Override