github/cosin
1
0
Fork 0
mirror of https://github.com/chatopera/cosin.git synced 2025-08-01 16:38:02 +08:00
Code Issues Releases Wiki Activity

Fix ACDVisBindingMw

Browse Source
This commit is contained in:
dengchao@xgtl 2020-04-16 11:06:09 +08:00
parent 04d6100c6d
commit 386e1fdfd3
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
contact-center/app/src/main/java/com/chatopera/cc/acd/middleware/visitor/ACDVisBindingMw.java
View File

@ -23,42 +23,44 @@ import com.chatopera.cc.persistence.repository.OrganRepository;
import com.chatopera.cc.persistence.repository.UserRepository; import com.chatopera.cc.persistence.repository.UserRepository;
import com.chatopera.compose4j.Functional; import com.chatopera.compose4j.Functional;
import com.chatopera.compose4j.Middleware; import com.chatopera.compose4j.Middleware;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.lang.NonNull;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.util.Optional;
@Component @Component
@RequiredArgsConstructor
public class ACDVisBindingMw implements Middleware<ACDComposeContext> { public class ACDVisBindingMw implements Middleware<ACDComposeContext> {
private final static Logger logger = LoggerFactory.getLogger(ACDVisBindingMw.class); private final static Logger logger = LoggerFactory.getLogger(ACDVisBindingMw.class);
@Autowired @NonNull
private UserRepository userRes; private final UserRepository userRes;
@Autowired @NonNull
private OrganRepository organRes; private final OrganRepository organRes;
/** /**
* 绑定技能组或坐席 * 绑定技能组或坐席
*
* @param ctx
* @param next
*/ */
@Override @Override
public void apply(final ACDComposeContext ctx, final Functional next) { public void apply(final ACDComposeContext ctx, final Functional next) {
/** /*
* 访客新上线的请求 * 访客新上线的请求
*/ */
/** /*
* 技能组 和 坐席 * 技能组 和 坐席
*/ */
if (StringUtils.isNotBlank(ctx.getOrganid())) { if (StringUtils.isNotBlank(ctx.getOrganid())) {
logger.info("[apply] bind skill {}", ctx.getOrganid()); logger.info("[apply] bind skill {}", ctx.getOrganid());
// 绑定技能组 // 绑定技能组
Organ organ = organRes.findOne(ctx.getOrganid()); Optional<Organ> optional = organRes.findById(ctx.getOrganid());
if (organ != null) { if (optional.isPresent()) {
Organ organ = optional.get();
ctx.getAgentUser().setSkill(organ.getId()); ctx.getAgentUser().setSkill(organ.getId());
ctx.setOrgan(organ); ctx.setOrgan(organ);
} }
@ -73,9 +75,12 @@ public class ACDVisBindingMw implements Middleware<ACDComposeContext> {
// 绑定坐席有可能是因为前端展示了技能组和坐席 // 绑定坐席有可能是因为前端展示了技能组和坐席
// 也有可能是坐席发送了邀请，该访客接收邀请 // 也有可能是坐席发送了邀请，该访客接收邀请
ctx.getAgentUser().setAgentno(ctx.getAgentno()); ctx.getAgentUser().setAgentno(ctx.getAgentno());
User agent = userRes.findOne(ctx.getAgentno()); Optional<User> optional = userRes.findById(ctx.getAgentno());
ctx.setAgent(agent); if (optional.isPresent()) {
ctx.getAgentUser().setAgentname(agent.getUname()); User agent = optional.get();
ctx.setAgent(agent);
ctx.getAgentUser().setAgentname(agent.getUname());
}
} else { } else {
// 如果没有绑定坐席，则清除之前的标记 // 如果没有绑定坐席，则清除之前的标记
ctx.getAgentUser().setAgentno(null); ctx.getAgentUser().setAgentno(null);