mirror of
https://github.com/chatopera/cosin.git
synced 2025-08-01 16:38:02 +08:00
Fix AgentServiceRepository related class
This commit is contained in:
dengchao@xgtl
parent
6064584884
commit
e463139cc2
@ -20,39 +20,39 @@ import com.chatopera.cc.basic.MainContext;
|
||||
import com.chatopera.cc.model.AgentService;
|
||||
import com.chatopera.cc.model.AgentUser;
|
||||
import com.chatopera.cc.persistence.repository.AgentServiceRepository;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.lang.NonNull;
|
||||
import org.springframework.lang.Nullable;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
@Slf4j
|
||||
@Component
|
||||
@RequiredArgsConstructor
|
||||
public class ACDChatbotService {
|
||||
private final static Logger logger = LoggerFactory.getLogger(ACDChatbotService.class);
|
||||
|
||||
@Autowired
|
||||
private AgentServiceRepository agentServiceRes;
|
||||
@NonNull
|
||||
private final AgentServiceRepository agentServiceRes;
|
||||
|
||||
/**
|
||||
* 为访客分配机器人客服， ACD策略，此处 AgentStatus 是建议 的 坐席， 如果启用了 历史服务坐席 优先策略， 则会默认检查历史坐席是否空闲，如果空闲，则分配，如果不空闲，则 分配当前建议的坐席
|
||||
*
|
||||
* @param agentUser
|
||||
* @param orgi
|
||||
* @return
|
||||
* @throws Exception
|
||||
*/
|
||||
@Nullable
|
||||
public AgentService processChatbotService(final String botName, final AgentUser agentUser, final String orgi) {
|
||||
AgentService agentService = new AgentService(); //放入缓存的对象
|
||||
Date now = new Date();
|
||||
if (StringUtils.isNotBlank(agentUser.getAgentserviceid())) {
|
||||
agentService = agentServiceRes.findByIdAndOrgi(agentUser.getAgentserviceid(), orgi);
|
||||
if (agentService != null) {
|
||||
agentService.setEndtime(now);
|
||||
if (agentService.getServicetime() != null) {
|
||||
agentService.setSessiontimes(System.currentTimeMillis() - agentService.getServicetime().getTime());
|
||||
}
|
||||
agentService.setStatus(MainContext.AgentUserStatusEnum.END.toString());
|
||||
}
|
||||
} else {
|
||||
agentService.setServicetime(now);
|
||||
agentService.setLogindate(now);
|
||||
@ -81,7 +81,9 @@ public class ACDChatbotService {
|
||||
agentService.setLeavemsg(false);
|
||||
}
|
||||
|
||||
if (agentService != null) {
|
||||
agentServiceRes.save(agentService);
|
||||
}
|
||||
return agentService;
|
||||
}
|
||||
|
||||
|
||||
@ -23,22 +23,19 @@ import com.chatopera.cc.persistence.repository.AgentServiceRepository;
|
||||
import com.chatopera.cc.util.Menu;
|
||||
import com.chatopera.cc.util.RestResult;
|
||||
import com.chatopera.cc.util.RestResultType;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.data.domain.Page;
|
||||
import org.springframework.data.domain.PageRequest;
|
||||
import org.springframework.data.domain.Sort;
|
||||
import org.springframework.data.jpa.domain.Specification;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.lang.NonNull;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import javax.persistence.criteria.CriteriaBuilder;
|
||||
import javax.persistence.criteria.CriteriaQuery;
|
||||
import javax.persistence.criteria.Predicate;
|
||||
import javax.persistence.criteria.Root;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
@ -47,33 +44,26 @@ import java.util.List;
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/api/leavemsg")
|
||||
@RequiredArgsConstructor
|
||||
public class ApiLeavemsgController extends Handler {
|
||||
|
||||
@Autowired
|
||||
private AgentServiceRepository agentServiceRepository;
|
||||
@NonNull
|
||||
private final AgentServiceRepository agentServiceRepository;
|
||||
|
||||
/**
|
||||
* 获取留言列表
|
||||
*
|
||||
* @param request
|
||||
* @param username 搜索用户名，精确搜索
|
||||
* @return
|
||||
*/
|
||||
@RequestMapping("/list")
|
||||
@Menu(type = "apps", subtype = "app", access = true)
|
||||
public ResponseEntity<RestResult> list(HttpServletRequest request, @RequestBody RequestValues<AgentService> values) {
|
||||
Page<AgentService> page = agentServiceRepository.findAll(new Specification<AgentService>() {
|
||||
@Override
|
||||
public Predicate toPredicate(Root<AgentService> root, CriteriaQuery<?> query,
|
||||
CriteriaBuilder cb) {
|
||||
List<Predicate> list = new ArrayList<Predicate>();
|
||||
public ResponseEntity<RestResult> list(@RequestBody RequestValues<AgentService> values) {
|
||||
Page<AgentService> page = agentServiceRepository.findAll((Specification<AgentService>) (root, query, cb) -> {
|
||||
List<Predicate> list = new ArrayList<>();
|
||||
list.add(cb.equal(root.get("leavemsg").as(Boolean.class), true));
|
||||
|
||||
list.add(cb.equal(root.get("leavemsgstatus").as(String.class), MainContext.LeaveMsgStatus.NOTPROCESS.toString()));
|
||||
|
||||
Predicate[] p = new Predicate[list.size()];
|
||||
return cb.and(list.toArray(p));
|
||||
}
|
||||
}, PageRequest.of(super.getP(values.getQuery()), super.getPs(values.getQuery()), Sort.Direction.DESC, "createtime"));
|
||||
return new ResponseEntity<>(new RestResult(RestResultType.OK, page), HttpStatus.OK);
|
||||
}
|
||||
|
||||
@ -23,23 +23,20 @@ import com.chatopera.cc.persistence.repository.AgentServiceRepository;
|
||||
import com.chatopera.cc.util.Menu;
|
||||
import com.chatopera.cc.util.RestResult;
|
||||
import com.chatopera.cc.util.RestResultType;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.data.domain.Page;
|
||||
import org.springframework.data.domain.PageRequest;
|
||||
import org.springframework.data.domain.Sort;
|
||||
import org.springframework.data.jpa.domain.Specification;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.lang.NonNull;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMethod;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import javax.persistence.criteria.CriteriaBuilder;
|
||||
import javax.persistence.criteria.CriteriaQuery;
|
||||
import javax.persistence.criteria.Predicate;
|
||||
import javax.persistence.criteria.Root;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.validation.Valid;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
@ -49,31 +46,24 @@ import java.util.List;
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/api/quality")
|
||||
@RequiredArgsConstructor
|
||||
public class ApiQualityController extends Handler {
|
||||
|
||||
@Autowired
|
||||
private AgentServiceRepository agentServiceRepository;
|
||||
@NonNull
|
||||
private final AgentServiceRepository agentServiceRepository;
|
||||
|
||||
/**
|
||||
* 获取质检列表
|
||||
*
|
||||
* @param request
|
||||
* @param username 搜索用户名，精确搜索
|
||||
* @return
|
||||
*/
|
||||
@RequestMapping(method = RequestMethod.GET)
|
||||
@Menu(type = "apps", subtype = "app", access = true)
|
||||
public ResponseEntity<RestResult> list(HttpServletRequest request, @Valid AgentService agentService, @Valid String begin, @Valid String end) {
|
||||
Page<AgentService> page = agentServiceRepository.findAll(new Specification<AgentService>() {
|
||||
@Override
|
||||
public Predicate toPredicate(Root<AgentService> root, CriteriaQuery<?> query,
|
||||
CriteriaBuilder cb) {
|
||||
List<Predicate> list = new ArrayList<Predicate>();
|
||||
public ResponseEntity<RestResult> list(HttpServletRequest request) {
|
||||
Page<AgentService> page = agentServiceRepository.findAll((Specification<AgentService>) (root, query, cb) -> {
|
||||
List<Predicate> list = new ArrayList<>();
|
||||
list.add((cb.equal(root.get("qualitystatus").as(String.class), MainContext.QualityStatusEnum.NODIS.toString())));
|
||||
|
||||
Predicate[] p = new Predicate[list.size()];
|
||||
return cb.and(list.toArray(p));
|
||||
}
|
||||
}, PageRequest.of(super.getP(request), super.getPs(request), Sort.Direction.DESC, "createtime"));
|
||||
return new ResponseEntity<>(new RestResult(RestResultType.OK, page), HttpStatus.OK);
|
||||
}
|
||||
|
||||
@ -20,27 +20,27 @@ import com.chatopera.cc.controller.Handler;
|
||||
import com.chatopera.cc.model.AgentService;
|
||||
import com.chatopera.cc.persistence.repository.AgentServiceRepository;
|
||||
import com.chatopera.cc.util.Menu;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.data.domain.Page;
|
||||
import org.springframework.data.domain.PageRequest;
|
||||
import org.springframework.lang.NonNull;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.ModelMap;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.validation.Valid;
|
||||
|
||||
@Controller
|
||||
@RequestMapping("/service")
|
||||
public class CommentController extends Handler{
|
||||
@Autowired
|
||||
private AgentServiceRepository agentServiceRes ;
|
||||
|
||||
@RequiredArgsConstructor
|
||||
public class CommentController extends Handler {
|
||||
@NonNull
|
||||
private final AgentServiceRepository agentServiceRes;
|
||||
|
||||
@RequestMapping("/comment/index")
|
||||
@Menu(type = "service" , subtype = "comment" , admin= true)
|
||||
public ModelAndView index(ModelMap map , HttpServletRequest request , String userid , String agentservice , @Valid String channel) {
|
||||
@Menu(type = "service", subtype = "comment", admin = true)
|
||||
public ModelAndView index(ModelMap map, HttpServletRequest request) {
|
||||
Page<AgentService> agentServiceList = agentServiceRes.findByOrgiAndSatisfaction(super.getOrgi(request), true, PageRequest.of(super.getP(request), super.getPs(request)));
|
||||
map.addAttribute("serviceList", agentServiceList);
|
||||
return request(super.createAppsTempletResponse("/apps/service/comment/index"));
|
||||
|
||||
@ -21,10 +21,6 @@ import com.chatopera.cc.acd.ACDVisitorDispatcher;
|
||||
import com.chatopera.cc.acd.basic.ACDComposeContext;
|
||||
import com.chatopera.cc.acd.basic.ACDMessageHelper;
|
||||
import com.chatopera.cc.basic.MainContext;
|
||||
import com.chatopera.cc.basic.MainContext.CallType;
|
||||
import com.chatopera.cc.basic.MainContext.ChannelType;
|
||||
import com.chatopera.cc.basic.MainContext.MessageType;
|
||||
import com.chatopera.cc.basic.MainContext.ReceiverType;
|
||||
import com.chatopera.cc.basic.MainUtils;
|
||||
import com.chatopera.cc.model.Contacts;
|
||||
import com.chatopera.cc.model.CousultInvite;
|
||||
@ -34,7 +30,6 @@ import com.chatopera.cc.proxy.OnlineUserProxy;
|
||||
import com.chatopera.cc.socketio.client.NettyClients;
|
||||
import com.chatopera.cc.socketio.message.AgentStatusMessage;
|
||||
import com.chatopera.cc.socketio.message.ChatMessage;
|
||||
import com.chatopera.cc.socketio.message.Message;
|
||||
import com.chatopera.cc.socketio.util.HumanUtils;
|
||||
import com.chatopera.cc.socketio.util.IMServiceUtils;
|
||||
import com.chatopera.cc.util.IP;
|
||||
@ -50,24 +45,42 @@ import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import java.net.InetSocketAddress;
|
||||
import java.util.Date;
|
||||
|
||||
@SuppressWarnings("unused")
|
||||
public class IMEventHandler {
|
||||
private final static Logger logger = LoggerFactory.getLogger(IMEventHandler.class);
|
||||
private static final Logger logger = LoggerFactory.getLogger(IMEventHandler.class);
|
||||
private static AgentUserProxy agentUserProxy;
|
||||
private static AgentServiceRepository agentServiceRepository;
|
||||
private static ACDVisitorDispatcher acdVisitorDispatcher;
|
||||
protected SocketIOServer server;
|
||||
|
||||
public IMEventHandler(SocketIOServer server) {
|
||||
this.server = server;
|
||||
}
|
||||
|
||||
static private AgentUserProxy agentUserProxy;
|
||||
static private AgentServiceRepository agentServiceRepository;
|
||||
static private ACDVisitorDispatcher acdVisitorDispatcher;
|
||||
private static AgentUserProxy getAgentUserProxy() {
|
||||
if (agentUserProxy == null) {
|
||||
agentUserProxy = MainContext.getContext().getBean(AgentUserProxy.class);
|
||||
}
|
||||
return agentUserProxy;
|
||||
}
|
||||
|
||||
private static AgentServiceRepository getAgentServiceRepository() {
|
||||
if (agentServiceRepository == null) {
|
||||
agentServiceRepository = MainContext.getContext().getBean(AgentServiceRepository.class);
|
||||
}
|
||||
return agentServiceRepository;
|
||||
}
|
||||
|
||||
private static ACDVisitorDispatcher getAcdVisitorDispatcher() {
|
||||
if (acdVisitorDispatcher == null) {
|
||||
acdVisitorDispatcher = MainContext.getContext().getBean(ACDVisitorDispatcher.class);
|
||||
}
|
||||
return acdVisitorDispatcher;
|
||||
}
|
||||
|
||||
/**
|
||||
* 接入访客并未访客寻找坐席服务人员
|
||||
*
|
||||
* @param client
|
||||
*/
|
||||
@OnConnect
|
||||
public void onConnect(SocketIOClient client) {
|
||||
@ -114,12 +127,12 @@ public class IMEventHandler {
|
||||
InetSocketAddress address = (InetSocketAddress) client.getRemoteAddress();
|
||||
String ip = MainUtils.getIpAddr(client.getHandshakeData().getHttpHeaders(), address.getHostString());
|
||||
|
||||
/**
|
||||
/*
|
||||
* 加入到 缓存列表
|
||||
*/
|
||||
NettyClients.getInstance().putIMEventClient(user, client);
|
||||
|
||||
/**
|
||||
/*
|
||||
* 更新坐席服务类型
|
||||
*/
|
||||
IMServiceUtils.shiftOpsType(user, orgi, MainContext.OptType.HUMAN);
|
||||
@ -129,7 +142,7 @@ public class IMEventHandler {
|
||||
ipdata = IPTools.getInstance().findGeography(ip);
|
||||
}
|
||||
|
||||
/**
|
||||
/*
|
||||
* 用户进入到对话连接 ， 排队用户请求 , 如果返回失败，
|
||||
* 表示当前坐席全忙，用户进入排队状态，当前提示信息 显示 当前排队的队列位置，
|
||||
* 不可进行对话，用户发送的消息作为留言处理
|
||||
@ -175,13 +188,11 @@ public class IMEventHandler {
|
||||
logger.info("[onDisconnect] user {}, orgi {}", user, orgi);
|
||||
if (user != null) {
|
||||
try {
|
||||
/**
|
||||
/*
|
||||
* 用户主动断开服务
|
||||
*/
|
||||
MainContext.getCache().findOneAgentUserByUserIdAndOrgi(user, orgi).ifPresent(p -> {
|
||||
ACDServiceRouter.getAcdAgentService().finishAgentService(p
|
||||
, orgi);
|
||||
});
|
||||
MainContext.getCache().findOneAgentUserByUserIdAndOrgi(user, orgi)
|
||||
.ifPresent(p -> ACDServiceRouter.getAcdAgentService().finishAgentService(p, orgi));
|
||||
} catch (Exception e) {
|
||||
logger.warn("[onDisconnect] error", e);
|
||||
}
|
||||
@ -228,7 +239,7 @@ public class IMEventHandler {
|
||||
if (data.getType() == null) {
|
||||
data.setType("message");
|
||||
}
|
||||
/**
|
||||
/*
|
||||
* 以下代码主要用于检查 访客端的字数限制
|
||||
*/
|
||||
CousultInvite invite = OnlineUserProxy.consult(data.getAppid(), data.getOrgi());
|
||||
@ -242,32 +253,11 @@ public class IMEventHandler {
|
||||
// else if (StringUtils.isNotBlank(data.getMessage()) && dataLength > 600) {
|
||||
// data.setMessage(data.getMessage().substring(0, 600));
|
||||
// }
|
||||
/**
|
||||
/*
|
||||
* 处理表情
|
||||
*/
|
||||
data.setMessage(MainUtils.processEmoti(data.getMessage()));
|
||||
HumanUtils.processMessage(data, data.getUserid());
|
||||
}
|
||||
|
||||
private static AgentUserProxy getAgentUserProxy() {
|
||||
if (agentUserProxy == null) {
|
||||
agentUserProxy = MainContext.getContext().getBean(AgentUserProxy.class);
|
||||
}
|
||||
return agentUserProxy;
|
||||
}
|
||||
|
||||
private static AgentServiceRepository getAgentServiceRepository() {
|
||||
if (agentServiceRepository == null) {
|
||||
agentServiceRepository = MainContext.getContext().getBean(AgentServiceRepository.class);
|
||||
}
|
||||
return agentServiceRepository;
|
||||
}
|
||||
|
||||
private static ACDVisitorDispatcher getAcdVisitorDispatcher() {
|
||||
if (acdVisitorDispatcher == null) {
|
||||
acdVisitorDispatcher = MainContext.getContext().getBean(ACDVisitorDispatcher.class);
|
||||
}
|
||||
return acdVisitorDispatcher;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -30,6 +30,8 @@ import org.apache.commons.lang.StringUtils;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import java.util.Optional;
|
||||
|
||||
public class HumanUtils {
|
||||
private final static Logger logger = LoggerFactory.getLogger(HumanUtils.class);
|
||||
private static AgentServiceRepository agentServiceRes;
|
||||
@ -37,9 +39,6 @@ public class HumanUtils {
|
||||
|
||||
/**
|
||||
* 发送文本消息
|
||||
*
|
||||
* @param data
|
||||
* @param userid
|
||||
*/
|
||||
public static void processMessage(ChatMessage data, String userid) {
|
||||
processMessage(data, MainContext.MediaType.TEXT.toString(), userid);
|
||||
@ -47,10 +46,6 @@ public class HumanUtils {
|
||||
|
||||
/**
|
||||
* 发送各种消息的底层方法
|
||||
*
|
||||
* @param chatMessage
|
||||
* @param msgtype
|
||||
* @param userid
|
||||
*/
|
||||
protected static void processMessage(final ChatMessage chatMessage, final String msgtype, final String userid) {
|
||||
logger.info("[processMessage] userid {}, msgtype {}", userid, msgtype);
|
||||
@ -59,7 +54,7 @@ public class HumanUtils {
|
||||
|
||||
Message outMessage = new Message();
|
||||
|
||||
/**
|
||||
/*
|
||||
* 访客的昵称
|
||||
*/
|
||||
// TODO 确定该值代表访客昵称
|
||||
@ -67,12 +62,14 @@ public class HumanUtils {
|
||||
agentUser.getNickname()) ? agentUser.getNickname() : "";
|
||||
|
||||
if (agentUser != null && StringUtils.isNotBlank(agentUser.getAgentserviceid())) {
|
||||
AgentService agentService = getAgentServiceRes().findOne(
|
||||
agentUser.getAgentserviceid());
|
||||
Optional<AgentService> optional = getAgentServiceRes().findById(agentUser.getAgentserviceid());
|
||||
if (optional.isPresent()) {
|
||||
AgentService agentService = optional.get();
|
||||
if (StringUtils.isNotBlank(agentService.getUsername())) {
|
||||
userNickName = agentService.getUsername();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 将访客名称修改为关联联系人的名称
|
||||
chatMessage.setUsername(userNickName);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user