suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

电话呼出日志优化

Browse Source
This commit is contained in:
俞扬
2023-08-16 16:04:46 +08:00
parent 286fc66c79
commit eb5441b4a0
4 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coolstore-partner-common/src/main/java/com/cool/store/enums/OperateLogFieldValueEnum.java
View File

@@ -50,7 +50,9 @@ public enum OperateLogFieldValueEnum {
FOLLOW_TASK_ID("followTaskId", "跟进任务id"),
ADD_LABELS("addLabels", "新增标签"),
REMOVE_LABELS("removeLabels", "移除标签"),
CALL_TRANS_NO("transNo", "呼叫请求编号")
CALL_TRANS_NO("transNo", "呼叫请求编号"),
INCOMING_USER_ID("incomingUserId", "接听人用户id"),
INCOMING_USER_NAME("incomingUserName", "接听人用户姓名"),
;

2
coolstore-partner-common/src/main/java/com/cool/store/enums/OperateTypeEnum.java
View File

@@ -38,7 +38,7 @@ public enum OperateTypeEnum {
ADD_FOLLOW_LOG("add_follow_log", "新增根据日志", Arrays.asList(FOLLOW_LOG)),
ADD_FOLLOW_TASK("add_follow_task", "新增跟进任务", Arrays.asList(FOLLOW_TASK_ID)),
CALL_UP("call_up", "拨打电话", Arrays.asList(OPERATE_USER_ID,OPERATE_USER_NAME, OPERATE_TIME, CALL_TRANS_NO)),
CALL_UP("call_up", "拨打电话", Arrays.asList(OPERATE_USER_ID,OPERATE_USER_NAME, OPERATE_TIME, CALL_TRANS_NO,INCOMING_USER_ID,INCOMING_USER_NAME)),
;

2
coolstore-partner-model/src/main/java/com/cool/store/dto/log/CallUpLogDTO.java
View File

@@ -13,4 +13,6 @@ import lombok.experimental.SuperBuilder;
@SuperBuilder
public class CallUpLogDTO extends LogBasicDTO{
private String transNo;
private String incomingUserId;
private String incomingUserName;
}

12
coolstore-partner-service/src/main/java/com/cool/store/service/impl/CallServiceImpl.java
View File

@@ -6,11 +6,13 @@ import com.alibaba.fastjson.JSON;
import com.cool.store.context.CurrentUserHolder;
import com.cool.store.context.LoginUserInfo;
import com.cool.store.dao.EnterpriseUserDAO;
import com.cool.store.dao.HyPartnerUserInfoDAO;
import com.cool.store.dto.call.CallUpDTO;
import com.cool.store.dto.log.CallUpLogDTO;
import com.cool.store.dto.log.EntrustOthersDTO;
import com.cool.store.entity.CallRecordDO;
import com.cool.store.entity.EnterpriseUserDO;
import com.cool.store.entity.HyPartnerUserInfoDO;
import com.cool.store.enums.CallStatusEnum;
import com.cool.store.enums.ErrorCodeEnum;
import com.cool.store.enums.OperateTypeEnum;
@@ -18,6 +20,7 @@ import com.cool.store.exception.ApiException;
import com.cool.store.handler.WebSocketServer;
import com.cool.store.mapper.CallRecordMapper;
import com.cool.store.mapper.HyOutboundMobileMapper;
import com.cool.store.mapper.HyPartnerUserInfoMapper;
import com.cool.store.request.CallFinishBackReq;
import com.cool.store.request.CallRecordBackReq;
import com.cool.store.request.CallUpReq;
@@ -33,6 +36,7 @@ import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.List;
import java.util.Objects;
/**
* @Author: young.yu
@@ -50,7 +54,7 @@ public class CallServiceImpl implements CallService {
private HyOutboundMobileMapper hyOutboundMobileMapper;
@Autowired
private EnterpriseUserDAO enterpriseUserDAO;
private HyPartnerUserInfoDAO hyPartnerUserInfoDAO;
@Autowired
private LogService logService;
@@ -91,8 +95,12 @@ public class CallServiceImpl implements CallService {
//记录日志
LoginUserInfo operator = CurrentUserHolder.getUser();
CallUpLogDTO log = CallUpLogDTO.builder().operateUserId(operator.getUserId()).operateUsername(operator.getName())
.operateTime(DateUtil.format(new Date(), CoolDateUtils.DATE_FORMAT_SEC))
.operateTime(DateUtil.format(new Date(), CoolDateUtils.DATE_FORMAT_SEC)).incomingUserId(request.getIncomingUserId())
.transNo(transNo).build();
HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByPartnerId(request.getIncomingUserId());
if(!Objects.isNull(hyPartnerUserInfoDO)){
log.setIncomingUserName(hyPartnerUserInfoDO.getUsername());
}
logService.recordBizLog(operator,Long.valueOf(request.getLineId()), OperateTypeEnum.CALL_UP,log);
return transNo;