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

Merge branch 'develop' of github.com:chatopera/cosin into develop

Browse Source
This commit is contained in:
Kyle 2018-09-04 19:08:48 +08:00
commit 432f897d92
No known key found for this signature in database
GPG Key ID: E9D96D736A2D3F3C
3 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contact-center/app/src/main/java/com/chatopera/cc/webim/service/repository/ServiceSummaryRepository.java
View File

@ -23,9 +23,11 @@ import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.domain.Specification;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
public interface ServiceSummaryRepository extends JpaRepository<AgentServiceSummary, String>{
public abstract AgentServiceSummary findByAgentserviceidAndOrgi(String agentserviceid , String orgi);
public abstract List<AgentServiceSummary> findByAgentserviceidAndOrgi(String agentserviceid , String orgi);
public abstract AgentServiceSummary findByIdAndOrgi(String id , String orgi) ;

20
contact-center/app/src/main/java/com/chatopera/cc/webim/web/handler/apps/agent/AgentController.java
View File

@ -211,9 +211,9 @@ public class AgentController extends Handler {
view.addObject("curagentuser", agentUser);
view.addObject("inviteData", OnlineUserUtils.cousult(agentUser.getAppid(), agentUser.getOrgi(), inviteRepository));
if(!StringUtils.isBlank(agentUser.getAgentserviceid())){
AgentServiceSummary summary = this.serviceSummaryRes.findByAgentserviceidAndOrgi(agentUser.getAgentserviceid(), super.getOrgi(request)) ;
if(summary!=null){
view.addObject("summary", summary) ;
List<AgentServiceSummary> summarizes = this.serviceSummaryRes.findByAgentserviceidAndOrgi(agentUser.getAgentserviceid(), super.getOrgi(request)) ;
if(summarizes.size() > 0){
view.addObject("summary", summarizes.get(0)) ;
}
}
@ -344,11 +344,11 @@ public class AgentController extends Handler {
agentUserTask.setTokenum(0);
agentUserTaskRes.save(agentUserTask) ;
}
if(!StringUtils.isBlank(agentUser.getAgentserviceid())){
AgentServiceSummary summary = this.serviceSummaryRes.findByAgentserviceidAndOrgi(agentUser.getAgentserviceid(), super.getOrgi(request)) ;
if(summary!=null){
view.addObject("summary", summary) ;
List<AgentServiceSummary> summarizes = this.serviceSummaryRes.findByAgentserviceidAndOrgi(agentUser.getAgentserviceid(), super.getOrgi(request)) ;
if(summarizes.size() > 0){
view.addObject("summary", summarizes.get(0)) ;
}
}
@ -924,9 +924,9 @@ public class AgentController extends Handler {
if(!StringUtils.isBlank(userid) && !StringUtils.isBlank(agentuserid)){
AgentUser agentUser = this.agentUserRepository.findByIdAndOrgi(agentuserid, super.getOrgi(request)) ;
if(agentUser!=null && !StringUtils.isBlank(agentUser.getAgentserviceid())){
AgentServiceSummary summary = this.serviceSummaryRes.findByAgentserviceidAndOrgi(agentUser.getAgentserviceid(), super.getOrgi(request)) ;
if(summary!=null){
map.addAttribute("summary", summary) ;
List<AgentServiceSummary> summaries = this.serviceSummaryRes.findByAgentserviceidAndOrgi(agentUser.getAgentserviceid(), super.getOrgi(request)) ;
if(summaries.size() > 0){
map.addAttribute("summary", summaries.get(0)) ;
}
}
map.addAttribute("tags", tagRes.findByOrgiAndTagtype(super.getOrgi(request) , UKDataContext.ModelType.SUMMARY.toString())) ;

10
contact-center/app/src/main/java/com/chatopera/cc/webim/web/handler/apps/service/OnlineUserController.java
View File

@ -121,8 +121,9 @@ public class OnlineUserController extends Handler {
}
if(agentService!=null){
AgentServiceSummary summary = serviceSummaryRes.findByAgentserviceidAndOrgi(agentService.getId(), super.getOrgi(request)) ;
map.put("summary" , summary) ;
List<AgentServiceSummary> summaries = serviceSummaryRes.findByAgentserviceidAndOrgi(agentService.getId(), super.getOrgi(request)) ;
if(summaries.size() > 0)
map.put("summary" , summaries.get(0)) ;
}
List<AgentUserContacts> agentUserContactsList = agentUserContactsRes.findByUseridAndOrgi(userid, super.getOrgi(request)) ;
@ -172,8 +173,9 @@ public class OnlineUserController extends Handler {
map.put("summaryTags", tagRes.findByOrgiAndTagtype(super.getOrgi(request) , UKDataContext.ModelType.SUMMARY.toString())) ;
if(agentService!=null){
AgentServiceSummary summary = serviceSummaryRes.findByAgentserviceidAndOrgi(agentService.getId(), super.getOrgi(request)) ;
map.put("summary" , summary) ;
List<AgentServiceSummary> summaries = serviceSummaryRes.findByAgentserviceidAndOrgi(agentService.getId(), super.getOrgi(request)) ;
if(summaries.size() > 0)
map.put("summary" , summaries.get(0)) ;
}
map.put("agentUserMessageList", chatMessageRepository.findByAgentserviceidAndOrgi(agentService.getId() , super.getOrgi(request), new PageRequest(0, 50, Direction.DESC , "updatetime")));