From 0329af25406df3bf9d238150a759267f823efac2 Mon Sep 17 00:00:00 2001 From: Hai Liang Wang Date: Mon, 11 Nov 2019 10:33:09 +0800 Subject: [PATCH] Fix chats audit, transfer agent and rename packages --- .../cc/{aop => aspect}/AgentUserAspect.java | 22 +-- .../cc/{aop => aspect}/BlackEntityAspect.java | 2 +- .../cc/{aop => aspect}/OnlineUserAspect.java | 3 +- .../{aop => aspect}/SyncDatabaseAspect.java | 2 +- .../cc/basic/auth/AuthRedisTemplate.java | 18 +++ .../java/com/chatopera/cc/cache/Cache.java | 2 +- .../ApplicationController.java | 2 +- .../cc/{handler => controller}/Handler.java | 4 +- .../LoginController.java | 2 +- .../admin/AdminController.java | 4 +- .../admin/AgentSkillController.java | 4 +- .../admin/AreaController.java | 4 +- .../admin/OrganController.java | 4 +- .../admin/RoleController.java | 4 +- .../admin/UsersController.java | 12 +- .../callcenter/CallCenterAclController.java | 4 +- .../callcenter/CallCenterBlackController.java | 4 +- .../callcenter/CallCenterController.java | 4 +- .../CallCenterExtentionController.java | 4 +- .../callcenter/CallCenterIvrController.java | 4 +- .../callcenter/CallCenterMediaController.java | 4 +- .../CallCenterResourceController.java | 4 +- .../CallCenterRouterController.java | 4 +- .../CallCenterSipTrunkController.java | 4 +- .../callcenter/CallCenterSkillController.java | 4 +- .../admin/channel/SNSAccountIMController.java | 4 +- .../admin/channel/WebIMController.java | 4 +- .../admin/config/SystemConfigController.java | 4 +- .../admin/config/SystemMessageController.java | 4 +- .../admin/system/MetadataController.java | 4 +- .../admin/system/SysDicController.java | 4 +- .../admin/system/TemplateController.java | 4 +- .../api/ApiAgentUserController.java | 9 +- .../api/ApiAppsController.java | 6 +- .../api/ApiChatMessageController.java | 4 +- .../api/ApiContactNotesController.java | 6 +- .../api/ApiContactTagsController.java | 6 +- .../api/ApiContactsController.java | 48 ++++++- .../api/ApiLeavemsgController.java | 4 +- .../api/ApiOnlineUserController.java | 4 +- .../api/ApiOrganController.java | 4 +- .../api/ApiQualityController.java | 4 +- .../api/ApiQuickReplyController.java | 4 +- .../api/ApiQuickTypeController.java | 4 +- .../api/ApiServiceQueneController.java | 4 +- .../api/ApiSysDicController.java | 8 +- .../api/ApiTagsController.java | 6 +- .../api/ApiUserController.java | 8 +- .../api/ApiWebIMController.java | 4 +- .../api/ApiWlContactsController.java | 6 +- .../api/QueryParams.java | 2 +- .../api/RequestValues.java | 2 +- .../api/UkefuApiTagsController.java | 4 +- .../api/auth/ApiLoginController.java | 4 +- .../api/auth/ApiTokensErrorController.java | 4 +- .../api/request/QueryParams.java | 2 +- .../api/request/RequestValues.java | 2 +- .../api/request/RestUtils.java | 2 +- .../apps/AgentAuditController.java | 126 +++++++++++++++--- .../apps/AgentController.java | 24 ++-- .../apps/AgentQualityController.java | 4 +- .../apps/AgentSettingsController.java | 4 +- .../apps/AppsController.java | 6 +- .../apps/ContactsController.java | 4 +- .../apps/CustomerController.java | 4 +- .../apps/EntIMController.java | 4 +- .../apps/ExtentionController.java | 4 +- .../apps/IMController.java | 4 +- .../apps/JobController.java | 4 +- .../apps/KbsController.java | 4 +- .../apps/MessageController.java | 4 +- .../apps/OrganizationController.java | 4 +- .../apps/QuickReplyController.java | 4 +- .../apps/SipTrunkController.java | 4 +- .../apps/TenantController.java | 4 +- .../apps/TopicController.java | 4 +- .../apps/report/CubeController.java | 4 +- .../apps/report/CubeLevelController.java | 4 +- .../apps/report/CubeMeasureController.java | 4 +- .../apps/report/DimensionController.java | 4 +- .../apps/report/ReportController.java | 4 +- .../apps/report/ReportDesignController.java | 4 +- .../apps/report/ReportViewController.java | 4 +- .../apps/service/AgentSummaryController.java | 4 +- .../apps/service/ChatServiceController.java | 5 +- .../apps/service/CommentController.java | 4 +- .../apps/service/OnlineUserController.java | 4 +- .../service/ProcessedSummaryController.java | 4 +- .../apps/service/StatsController.java | 4 +- .../resource/CallAgentResourceController.java | 4 +- .../resource/ContactsResourceController.java | 4 +- .../resource/CssResourceController.java | 4 +- .../resource/MediaController.java | 4 +- .../QuickReplyResourceController.java | 4 +- .../resource/SysDicResourceController.java | 4 +- .../resource/UsersResourceController.java | 4 +- .../interceptor/LogIntercreptorHandler.java | 2 +- .../com/chatopera/cc/proxy/OrganProxy.java | 2 +- .../socketio/handler/AgentEventHandler.java | 6 +- .../templates/apps/agent/transfer.html | 60 ++++----- .../apps/business/contacts/embed/index.html | 7 +- .../apps/business/contacts/index.html | 27 ++-- .../templates/apps/cca/agentusers.html | 52 ++++---- .../templates/apps/cca/blacklistadd.html | 2 +- .../templates/apps/cca/mainagentuser.html | 2 +- .../templates/apps/cca/transfer.html | 6 +- .../resources/templates/apps/im/index.html | 8 +- 107 files changed, 462 insertions(+), 327 deletions(-) rename contact-center/app/src/main/java/com/chatopera/cc/{aop => aspect}/AgentUserAspect.java (84%) rename contact-center/app/src/main/java/com/chatopera/cc/{aop => aspect}/BlackEntityAspect.java (98%) rename contact-center/app/src/main/java/com/chatopera/cc/{aop => aspect}/OnlineUserAspect.java (96%) rename contact-center/app/src/main/java/com/chatopera/cc/{aop => aspect}/SyncDatabaseAspect.java (96%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/ApplicationController.java (96%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/Handler.java (96%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/LoginController.java (97%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/admin/AdminController.java (97%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/admin/AgentSkillController.java (95%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/admin/AreaController.java (95%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/admin/OrganController.java (97%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/admin/RoleController.java (97%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/admin/UsersController.java (89%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/admin/callcenter/CallCenterAclController.java (95%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/admin/callcenter/CallCenterBlackController.java (95%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/admin/callcenter/CallCenterController.java (96%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/admin/callcenter/CallCenterExtentionController.java (97%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/admin/callcenter/CallCenterIvrController.java (96%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/admin/callcenter/CallCenterMediaController.java (96%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/admin/callcenter/CallCenterResourceController.java (96%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/admin/callcenter/CallCenterRouterController.java (96%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/admin/callcenter/CallCenterSipTrunkController.java (96%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/admin/callcenter/CallCenterSkillController.java (96%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/admin/channel/SNSAccountIMController.java (96%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/admin/channel/WebIMController.java (97%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/admin/config/SystemConfigController.java (97%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/admin/config/SystemMessageController.java (96%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/admin/system/MetadataController.java (97%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/admin/system/SysDicController.java (97%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/admin/system/TemplateController.java (96%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/api/ApiAgentUserController.java (95%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/api/ApiAppsController.java (97%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/api/ApiChatMessageController.java (94%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/api/ApiContactNotesController.java (98%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/api/ApiContactTagsController.java (98%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/api/ApiContactsController.java (82%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/api/ApiLeavemsgController.java (95%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/api/ApiOnlineUserController.java (94%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/api/ApiOrganController.java (94%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/api/ApiQualityController.java (95%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/api/ApiQuickReplyController.java (95%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/api/ApiQuickTypeController.java (95%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/api/ApiServiceQueneController.java (97%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/api/ApiSysDicController.java (93%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/api/ApiTagsController.java (97%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/api/ApiUserController.java (96%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/api/ApiWebIMController.java (94%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/api/ApiWlContactsController.java (98%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/api/QueryParams.java (93%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/api/RequestValues.java (93%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/api/UkefuApiTagsController.java (93%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/api/auth/ApiLoginController.java (95%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/api/auth/ApiTokensErrorController.java (92%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/api/request/QueryParams.java (92%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/api/request/RequestValues.java (92%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/api/request/RestUtils.java (97%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/apps/AgentAuditController.java (84%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/apps/AgentController.java (96%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/apps/AgentQualityController.java (96%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/apps/AgentSettingsController.java (97%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/apps/AppsController.java (96%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/apps/ContactsController.java (97%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/apps/CustomerController.java (97%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/apps/EntIMController.java (97%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/apps/ExtentionController.java (96%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/apps/IMController.java (97%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/apps/JobController.java (94%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/apps/KbsController.java (96%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/apps/MessageController.java (91%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/apps/OrganizationController.java (95%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/apps/QuickReplyController.java (97%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/apps/SipTrunkController.java (96%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/apps/TenantController.java (97%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/apps/TopicController.java (97%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/apps/report/CubeController.java (97%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/apps/report/CubeLevelController.java (96%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/apps/report/CubeMeasureController.java (96%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/apps/report/DimensionController.java (96%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/apps/report/ReportController.java (97%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/apps/report/ReportDesignController.java (97%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/apps/report/ReportViewController.java (95%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/apps/service/AgentSummaryController.java (97%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/apps/service/ChatServiceController.java (97%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/apps/service/CommentController.java (93%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/apps/service/OnlineUserController.java (96%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/apps/service/ProcessedSummaryController.java (97%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/apps/service/StatsController.java (96%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/resource/CallAgentResourceController.java (94%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/resource/ContactsResourceController.java (92%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/resource/CssResourceController.java (92%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/resource/MediaController.java (96%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/resource/QuickReplyResourceController.java (92%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/resource/SysDicResourceController.java (93%) rename contact-center/app/src/main/java/com/chatopera/cc/{handler => controller}/resource/UsersResourceController.java (95%) diff --git a/contact-center/app/src/main/java/com/chatopera/cc/aop/AgentUserAspect.java b/contact-center/app/src/main/java/com/chatopera/cc/aspect/AgentUserAspect.java similarity index 84% rename from contact-center/app/src/main/java/com/chatopera/cc/aop/AgentUserAspect.java rename to contact-center/app/src/main/java/com/chatopera/cc/aspect/AgentUserAspect.java index 321ec91c..33dd85a5 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/aop/AgentUserAspect.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/aspect/AgentUserAspect.java @@ -14,17 +14,14 @@ * limitations under the License. */ -package com.chatopera.cc.aop; +package com.chatopera.cc.aspect; import com.chatopera.cc.basic.MainContext; import com.chatopera.cc.cache.Cache; import com.chatopera.cc.cache.RedisCommand; import com.chatopera.cc.cache.RedisKey; -import com.chatopera.cc.exception.CSKefuCacheException; import com.chatopera.cc.model.AgentUser; -import com.chatopera.cc.model.AgentUserAudit; import com.chatopera.cc.proxy.AgentAuditProxy; -import com.chatopera.cc.proxy.AgentUserProxy; import org.apache.commons.lang.StringUtils; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.ProceedingJoinPoint; @@ -41,7 +38,6 @@ import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import java.util.HashMap; import java.util.Optional; @Aspect @@ -59,7 +55,7 @@ public class AgentUserAspect { @Autowired private AgentAuditProxy agentAuditProxy; - @Before("execution(* com.chatopera.cc.persistence.repository.AgentUserRepository.save(..))") + @After("execution(* com.chatopera.cc.persistence.repository.AgentUserRepository.save(..))") public void save(final JoinPoint joinPoint) { final AgentUser agentUser = (AgentUser) joinPoint.getArgs()[0]; logger.info( @@ -72,18 +68,8 @@ public class AgentUserAspect { return; } - // 从缓存恢复之前的AgentUser - final Optional opt = cache.findOneAgentUserByUserIdAndOrgi( - agentUser.getUserid(), agentUser.getOrgi()); - if (opt.isPresent()) { - if (!StringUtils.equals(opt.get().getAgentno(), agentUser.getAgentno())) { - // 发生了转接 - agentAuditProxy.updateAgentUserAudits(agentUser); - } - } else { - // 新建AgentUser - agentAuditProxy.updateAgentUserAudits(agentUser); - } + // 更新坐席监控信息 + agentAuditProxy.updateAgentUserAudits(agentUser); // 同步缓存 cache.putAgentUserByOrgi(agentUser, agentUser.getOrgi()); diff --git a/contact-center/app/src/main/java/com/chatopera/cc/aop/BlackEntityAspect.java b/contact-center/app/src/main/java/com/chatopera/cc/aspect/BlackEntityAspect.java similarity index 98% rename from contact-center/app/src/main/java/com/chatopera/cc/aop/BlackEntityAspect.java rename to contact-center/app/src/main/java/com/chatopera/cc/aspect/BlackEntityAspect.java index c4d07a8a..4dbfead8 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/aop/BlackEntityAspect.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/aspect/BlackEntityAspect.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.chatopera.cc.aop; +package com.chatopera.cc.aspect; import com.chatopera.cc.cache.Cache; import com.chatopera.cc.model.BlackEntity; diff --git a/contact-center/app/src/main/java/com/chatopera/cc/aop/OnlineUserAspect.java b/contact-center/app/src/main/java/com/chatopera/cc/aspect/OnlineUserAspect.java similarity index 96% rename from contact-center/app/src/main/java/com/chatopera/cc/aop/OnlineUserAspect.java rename to contact-center/app/src/main/java/com/chatopera/cc/aspect/OnlineUserAspect.java index 76ae44a0..3b4e4c33 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/aop/OnlineUserAspect.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/aspect/OnlineUserAspect.java @@ -13,14 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chatopera.cc.aop; +package com.chatopera.cc.aspect; import com.chatopera.cc.basic.MainContext; import com.chatopera.cc.cache.Cache; import com.chatopera.cc.model.OnlineUser; import org.apache.commons.lang.StringUtils; import org.aspectj.lang.JoinPoint; -import org.aspectj.lang.annotation.After; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Before; import org.slf4j.Logger; diff --git a/contact-center/app/src/main/java/com/chatopera/cc/aop/SyncDatabaseAspect.java b/contact-center/app/src/main/java/com/chatopera/cc/aspect/SyncDatabaseAspect.java similarity index 96% rename from contact-center/app/src/main/java/com/chatopera/cc/aop/SyncDatabaseAspect.java rename to contact-center/app/src/main/java/com/chatopera/cc/aspect/SyncDatabaseAspect.java index 3d8a03dd..6cc12b49 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/aop/SyncDatabaseAspect.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/aspect/SyncDatabaseAspect.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chatopera.cc.aop; +package com.chatopera.cc.aspect; import com.chatopera.cc.model.ESBean; import com.chatopera.cc.persistence.hibernate.BaseService; diff --git a/contact-center/app/src/main/java/com/chatopera/cc/basic/auth/AuthRedisTemplate.java b/contact-center/app/src/main/java/com/chatopera/cc/basic/auth/AuthRedisTemplate.java index f0eaadcd..932ecc8f 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/basic/auth/AuthRedisTemplate.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/basic/auth/AuthRedisTemplate.java @@ -1,3 +1,18 @@ +/* + * Copyright (C) 2019 Chatopera Inc, + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package com.chatopera.cc.basic.auth; import org.springframework.data.redis.connection.DefaultStringRedisConnection; @@ -7,6 +22,9 @@ import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.serializer.RedisSerializer; import org.springframework.data.redis.serializer.StringRedisSerializer; +/** + * 存储Auth Token的Redis连接 + */ public class AuthRedisTemplate extends RedisTemplate { public AuthRedisTemplate() { RedisSerializer stringSerializer = new StringRedisSerializer(); diff --git a/contact-center/app/src/main/java/com/chatopera/cc/cache/Cache.java b/contact-center/app/src/main/java/com/chatopera/cc/cache/Cache.java index 48a1f4ab..d62fe6e0 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/cache/Cache.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/cache/Cache.java @@ -15,7 +15,7 @@ */ package com.chatopera.cc.cache; -import com.chatopera.cc.aop.AgentUserAspect; +import com.chatopera.cc.aspect.AgentUserAspect; import com.chatopera.cc.basic.MainContext; import com.chatopera.cc.exception.CSKefuCacheException; import com.chatopera.cc.model.*; diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/ApplicationController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/ApplicationController.java similarity index 96% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/ApplicationController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/ApplicationController.java index 4fc4d949..670b7fdf 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/ApplicationController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/ApplicationController.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chatopera.cc.handler; +package com.chatopera.cc.controller; import com.chatopera.cc.acd.AutomaticServiceDist; import com.chatopera.cc.basic.MainContext; diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/Handler.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/Handler.java similarity index 96% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/Handler.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/Handler.java index 818f0980..27d1eae4 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/Handler.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/Handler.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chatopera.cc.handler; +package com.chatopera.cc.controller; import com.chatopera.cc.basic.Constants; import com.chatopera.cc.basic.MainContext; @@ -23,7 +23,7 @@ import com.chatopera.cc.basic.Viewport; import com.chatopera.cc.basic.auth.AuthToken; import com.chatopera.cc.cache.Cache; import com.chatopera.cc.exception.CSKefuException; -import com.chatopera.cc.handler.api.QueryParams; +import com.chatopera.cc.controller.api.QueryParams; import com.chatopera.cc.model.StreamingFile; import com.chatopera.cc.model.SystemConfig; import com.chatopera.cc.model.Tenant; diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/LoginController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/LoginController.java similarity index 97% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/LoginController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/LoginController.java index 80107d6f..98427935 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/LoginController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/LoginController.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chatopera.cc.handler; +package com.chatopera.cc.controller; import com.chatopera.cc.acd.AutomaticServiceDist; import com.chatopera.cc.basic.Constants; diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/admin/AdminController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/admin/AdminController.java similarity index 97% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/admin/AdminController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/admin/AdminController.java index d621b7d6..4c1bbb2b 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/admin/AdminController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/admin/AdminController.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chatopera.cc.handler.admin; +package com.chatopera.cc.controller.admin; import com.chatopera.cc.acd.AutomaticServiceDist; import com.chatopera.cc.basic.MainContext; import com.chatopera.cc.basic.MainUtils; import com.chatopera.cc.cache.Cache; -import com.chatopera.cc.handler.Handler; +import com.chatopera.cc.controller.Handler; import com.chatopera.cc.socketio.client.NettyClients; import com.chatopera.cc.model.SysDic; import com.chatopera.cc.model.User; diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/admin/AgentSkillController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/admin/AgentSkillController.java similarity index 95% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/admin/AgentSkillController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/admin/AgentSkillController.java index ec8c1f59..f0073837 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/admin/AgentSkillController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/admin/AgentSkillController.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chatopera.cc.handler.admin; +package com.chatopera.cc.controller.admin; import java.util.Date; import java.util.List; @@ -31,7 +31,7 @@ import org.springframework.web.servlet.ModelAndView; import com.chatopera.cc.util.Menu; import com.chatopera.cc.persistence.repository.SkillRepository; -import com.chatopera.cc.handler.Handler; +import com.chatopera.cc.controller.Handler; import com.chatopera.cc.model.Skill; /** diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/admin/AreaController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/admin/AreaController.java similarity index 95% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/admin/AreaController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/admin/AreaController.java index ad2af5bc..8f8723b0 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/admin/AreaController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/admin/AreaController.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chatopera.cc.handler.admin; +package com.chatopera.cc.controller.admin; import java.io.IOException; import java.util.Date; @@ -33,7 +33,7 @@ import org.springframework.web.servlet.ModelAndView; import com.chatopera.cc.util.Menu; import com.chatopera.cc.persistence.repository.AreaTypeRepository; import com.chatopera.cc.persistence.repository.SysDicRepository; -import com.chatopera.cc.handler.Handler; +import com.chatopera.cc.controller.Handler; import com.chatopera.cc.model.AreaType; import com.chatopera.cc.model.SysDic; import com.chatopera.cc.model.Dict; diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/admin/OrganController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/admin/OrganController.java similarity index 97% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/admin/OrganController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/admin/OrganController.java index 024bd76b..22319b62 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/admin/OrganController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/admin/OrganController.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chatopera.cc.handler.admin; +package com.chatopera.cc.controller.admin; import com.chatopera.cc.basic.MainContext; import com.chatopera.cc.cache.Cache; -import com.chatopera.cc.handler.Handler; +import com.chatopera.cc.controller.Handler; import com.chatopera.cc.model.*; import com.chatopera.cc.persistence.repository.*; import com.chatopera.cc.basic.Constants; diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/admin/RoleController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/admin/RoleController.java similarity index 97% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/admin/RoleController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/admin/RoleController.java index 195b0b3e..8809530e 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/admin/RoleController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/admin/RoleController.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chatopera.cc.handler.admin; +package com.chatopera.cc.controller.admin; import com.chatopera.cc.basic.MainContext; -import com.chatopera.cc.handler.Handler; +import com.chatopera.cc.controller.Handler; import com.chatopera.cc.model.*; import com.chatopera.cc.persistence.repository.*; import com.chatopera.cc.basic.Constants; diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/admin/UsersController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/admin/UsersController.java similarity index 89% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/admin/UsersController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/admin/UsersController.java index 2c88627c..0cdcf5cd 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/admin/UsersController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/admin/UsersController.java @@ -14,22 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chatopera.cc.handler.admin; +package com.chatopera.cc.controller.admin; -import com.chatopera.cc.basic.Constants; -import com.chatopera.cc.basic.MainContext; -import com.chatopera.cc.basic.MainUtils; -import com.chatopera.cc.cache.Cache; -import com.chatopera.cc.handler.Handler; -import com.chatopera.cc.model.AgentStatus; +import com.chatopera.cc.controller.Handler; import com.chatopera.cc.model.User; import com.chatopera.cc.model.UserRole; import com.chatopera.cc.persistence.repository.UserRepository; import com.chatopera.cc.persistence.repository.UserRoleRepository; import com.chatopera.cc.proxy.OnlineUserProxy; -import com.chatopera.cc.proxy.UserProxy; import com.chatopera.cc.util.Menu; -import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -43,7 +36,6 @@ import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletRequest; import javax.validation.Valid; import java.io.IOException; -import java.util.Date; import java.util.List; /** diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/admin/callcenter/CallCenterAclController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/admin/callcenter/CallCenterAclController.java similarity index 95% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/admin/callcenter/CallCenterAclController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/admin/callcenter/CallCenterAclController.java index 19ebcdd7..7c729b33 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/admin/callcenter/CallCenterAclController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/admin/callcenter/CallCenterAclController.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chatopera.cc.handler.admin.callcenter; +package com.chatopera.cc.controller.admin.callcenter; import javax.servlet.http.HttpServletRequest; import javax.validation.Valid; import com.chatopera.cc.util.Menu; import com.chatopera.cc.persistence.repository.PbxHostRepository; -import com.chatopera.cc.handler.Handler; +import com.chatopera.cc.controller.Handler; import com.chatopera.cc.model.Acl; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/admin/callcenter/CallCenterBlackController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/admin/callcenter/CallCenterBlackController.java similarity index 95% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/admin/callcenter/CallCenterBlackController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/admin/callcenter/CallCenterBlackController.java index 65d4077a..854e98af 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/admin/callcenter/CallCenterBlackController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/admin/callcenter/CallCenterBlackController.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chatopera.cc.handler.admin.callcenter; +package com.chatopera.cc.controller.admin.callcenter; import javax.servlet.http.HttpServletRequest; import javax.validation.Valid; @@ -29,7 +29,7 @@ import org.springframework.web.servlet.ModelAndView; import com.chatopera.cc.util.Menu; import com.chatopera.cc.persistence.repository.BlackListRepository; -import com.chatopera.cc.handler.Handler; +import com.chatopera.cc.controller.Handler; import com.chatopera.cc.model.BlackEntity; @Controller diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/admin/callcenter/CallCenterController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/admin/callcenter/CallCenterController.java similarity index 96% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/admin/callcenter/CallCenterController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/admin/callcenter/CallCenterController.java index a288d271..49dfaf79 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/admin/callcenter/CallCenterController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/admin/callcenter/CallCenterController.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chatopera.cc.handler.admin.callcenter; +package com.chatopera.cc.controller.admin.callcenter; import java.util.List; @@ -26,7 +26,7 @@ import com.chatopera.cc.basic.MainContext; import com.chatopera.cc.util.Menu; import com.chatopera.cc.persistence.interfaces.CallCenterInterface; import com.chatopera.cc.persistence.repository.PbxHostRepository; -import com.chatopera.cc.handler.Handler; +import com.chatopera.cc.controller.Handler; import com.chatopera.cc.model.PbxHost; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/admin/callcenter/CallCenterExtentionController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/admin/callcenter/CallCenterExtentionController.java similarity index 97% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/admin/callcenter/CallCenterExtentionController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/admin/callcenter/CallCenterExtentionController.java index b9a4c74d..71db07fb 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/admin/callcenter/CallCenterExtentionController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/admin/callcenter/CallCenterExtentionController.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chatopera.cc.handler.admin.callcenter; +package com.chatopera.cc.controller.admin.callcenter; import com.chatopera.cc.cache.Cache; -import com.chatopera.cc.handler.Handler; +import com.chatopera.cc.controller.Handler; import com.chatopera.cc.model.Extention; import com.chatopera.cc.model.PbxHost; import com.chatopera.cc.model.User; diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/admin/callcenter/CallCenterIvrController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/admin/callcenter/CallCenterIvrController.java similarity index 96% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/admin/callcenter/CallCenterIvrController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/admin/callcenter/CallCenterIvrController.java index c9192670..af9d1752 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/admin/callcenter/CallCenterIvrController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/admin/callcenter/CallCenterIvrController.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chatopera.cc.handler.admin.callcenter; +package com.chatopera.cc.controller.admin.callcenter; import javax.servlet.http.HttpServletRequest; import javax.validation.Valid; @@ -30,7 +30,7 @@ import org.springframework.web.servlet.ModelAndView; import com.chatopera.cc.persistence.repository.ExtentionRepository; import com.chatopera.cc.persistence.repository.IvrMenuRepository; -import com.chatopera.cc.handler.Handler; +import com.chatopera.cc.controller.Handler; import com.chatopera.cc.model.Extention; @Controller diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/admin/callcenter/CallCenterMediaController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/admin/callcenter/CallCenterMediaController.java similarity index 96% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/admin/callcenter/CallCenterMediaController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/admin/callcenter/CallCenterMediaController.java index 581ba141..6c8219d7 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/admin/callcenter/CallCenterMediaController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/admin/callcenter/CallCenterMediaController.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chatopera.cc.handler.admin.callcenter; +package com.chatopera.cc.controller.admin.callcenter; import java.io.File; import java.io.IOException; @@ -37,7 +37,7 @@ import com.chatopera.cc.util.Menu; import com.chatopera.cc.basic.MainUtils; import com.chatopera.cc.persistence.repository.MediaRepository; import com.chatopera.cc.persistence.repository.PbxHostRepository; -import com.chatopera.cc.handler.Handler; +import com.chatopera.cc.controller.Handler; import com.chatopera.cc.model.Media; @Controller diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/admin/callcenter/CallCenterResourceController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/admin/callcenter/CallCenterResourceController.java similarity index 96% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/admin/callcenter/CallCenterResourceController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/admin/callcenter/CallCenterResourceController.java index b9531988..da821020 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/admin/callcenter/CallCenterResourceController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/admin/callcenter/CallCenterResourceController.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chatopera.cc.handler.admin.callcenter; +package com.chatopera.cc.controller.admin.callcenter; import java.util.List; @@ -27,7 +27,7 @@ import com.chatopera.cc.util.Menu; import com.chatopera.cc.persistence.interfaces.CallCenterInterface; import com.chatopera.cc.persistence.repository.PbxHostRepository; import com.chatopera.cc.persistence.repository.ServiceAiRepository; -import com.chatopera.cc.handler.Handler; +import com.chatopera.cc.controller.Handler; import com.chatopera.cc.model.PbxHost; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/admin/callcenter/CallCenterRouterController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/admin/callcenter/CallCenterRouterController.java similarity index 96% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/admin/callcenter/CallCenterRouterController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/admin/callcenter/CallCenterRouterController.java index 7de5087c..c4dfa51b 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/admin/callcenter/CallCenterRouterController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/admin/callcenter/CallCenterRouterController.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chatopera.cc.handler.admin.callcenter; +package com.chatopera.cc.controller.admin.callcenter; import java.util.List; @@ -32,7 +32,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; import com.chatopera.cc.persistence.repository.RouterRulesRepository; -import com.chatopera.cc.handler.Handler; +import com.chatopera.cc.controller.Handler; import com.chatopera.cc.model.RouterRules; @Controller diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/admin/callcenter/CallCenterSipTrunkController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/admin/callcenter/CallCenterSipTrunkController.java similarity index 96% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/admin/callcenter/CallCenterSipTrunkController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/admin/callcenter/CallCenterSipTrunkController.java index 21e82fad..4961f1aa 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/admin/callcenter/CallCenterSipTrunkController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/admin/callcenter/CallCenterSipTrunkController.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chatopera.cc.handler.admin.callcenter; +package com.chatopera.cc.controller.admin.callcenter; import com.chatopera.cc.cache.Cache; -import com.chatopera.cc.handler.Handler; +import com.chatopera.cc.controller.Handler; import com.chatopera.cc.model.SipTrunk; import com.chatopera.cc.persistence.repository.PbxHostRepository; import com.chatopera.cc.persistence.repository.SipTrunkRepository; diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/admin/callcenter/CallCenterSkillController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/admin/callcenter/CallCenterSkillController.java similarity index 96% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/admin/callcenter/CallCenterSkillController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/admin/callcenter/CallCenterSkillController.java index 7568f785..b09a528f 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/admin/callcenter/CallCenterSkillController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/admin/callcenter/CallCenterSkillController.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chatopera.cc.handler.admin.callcenter; +package com.chatopera.cc.controller.admin.callcenter; import java.util.Date; import java.util.List; @@ -27,7 +27,7 @@ import com.chatopera.cc.persistence.repository.CallCenterSkillRepository; import com.chatopera.cc.persistence.repository.ExtentionRepository; import com.chatopera.cc.persistence.repository.PbxHostRepository; import com.chatopera.cc.persistence.repository.SkillExtentionRepository; -import com.chatopera.cc.handler.Handler; +import com.chatopera.cc.controller.Handler; import com.chatopera.cc.model.CallCenterSkill; import com.chatopera.cc.model.Extention; import com.chatopera.cc.model.PbxHost; diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/admin/channel/SNSAccountIMController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/admin/channel/SNSAccountIMController.java similarity index 96% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/admin/channel/SNSAccountIMController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/admin/channel/SNSAccountIMController.java index 83da70af..21ef56e4 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/admin/channel/SNSAccountIMController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/admin/channel/SNSAccountIMController.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chatopera.cc.handler.admin.channel; +package com.chatopera.cc.controller.admin.channel; import com.chatopera.cc.basic.MainContext; import com.chatopera.cc.util.Base62; @@ -23,7 +23,7 @@ import com.chatopera.cc.basic.MainUtils; import com.chatopera.cc.persistence.repository.ConsultInviteRepository; import com.chatopera.cc.persistence.repository.SNSAccountRepository; import com.chatopera.cc.persistence.repository.SecretRepository; -import com.chatopera.cc.handler.Handler; +import com.chatopera.cc.controller.Handler; import com.chatopera.cc.model.CousultInvite; import com.chatopera.cc.model.SNSAccount; import com.chatopera.cc.model.Secret; diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/admin/channel/WebIMController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/admin/channel/WebIMController.java similarity index 97% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/admin/channel/WebIMController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/admin/channel/WebIMController.java index ab0e240a..b880c8d1 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/admin/channel/WebIMController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/admin/channel/WebIMController.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chatopera.cc.handler.admin.channel; +package com.chatopera.cc.controller.admin.channel; import com.chatopera.cc.cache.Cache; -import com.chatopera.cc.handler.Handler; +import com.chatopera.cc.controller.Handler; import com.chatopera.cc.model.CousultInvite; import com.chatopera.cc.model.Organ; import com.chatopera.cc.model.OrgiSkillRel; diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/admin/config/SystemConfigController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/admin/config/SystemConfigController.java similarity index 97% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/admin/config/SystemConfigController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/admin/config/SystemConfigController.java index 7bffa33c..093a630c 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/admin/config/SystemConfigController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/admin/config/SystemConfigController.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chatopera.cc.handler.admin.config; +package com.chatopera.cc.controller.admin.config; import com.chatopera.cc.basic.MainContext; import com.chatopera.cc.basic.MainUtils; -import com.chatopera.cc.handler.Handler; +import com.chatopera.cc.controller.Handler; import com.chatopera.cc.model.Secret; import com.chatopera.cc.model.SysDic; import com.chatopera.cc.model.SystemConfig; diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/admin/config/SystemMessageController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/admin/config/SystemMessageController.java similarity index 96% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/admin/config/SystemMessageController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/admin/config/SystemMessageController.java index 79bb00db..34783c48 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/admin/config/SystemMessageController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/admin/config/SystemMessageController.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chatopera.cc.handler.admin.config; +package com.chatopera.cc.controller.admin.config; import java.io.IOException; import java.security.NoSuchAlgorithmException; @@ -25,7 +25,7 @@ import javax.validation.Valid; import com.chatopera.cc.basic.MainContext; import com.chatopera.cc.util.Menu; import com.chatopera.cc.persistence.repository.SystemMessageRepository; -import com.chatopera.cc.handler.Handler; +import com.chatopera.cc.controller.Handler; import com.chatopera.cc.model.SystemMessage; import com.chatopera.cc.model.Dict; import org.apache.commons.lang3.StringUtils; diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/admin/system/MetadataController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/admin/system/MetadataController.java similarity index 97% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/admin/system/MetadataController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/admin/system/MetadataController.java index c0fb4702..10ad6c80 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/admin/system/MetadataController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/admin/system/MetadataController.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chatopera.cc.handler.admin.system; +package com.chatopera.cc.controller.admin.system; import java.sql.Connection; import java.sql.SQLException; @@ -54,7 +54,7 @@ import org.springframework.web.servlet.ModelAndView; import com.chatopera.cc.basic.MainUtils; import com.chatopera.cc.util.CskefuList; import com.chatopera.cc.persistence.repository.MetadataRepository; -import com.chatopera.cc.handler.Handler; +import com.chatopera.cc.controller.Handler; import com.chatopera.cc.model.MetadataTable; import com.chatopera.cc.model.Dict; diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/admin/system/SysDicController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/admin/system/SysDicController.java similarity index 97% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/admin/system/SysDicController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/admin/system/SysDicController.java index cee0ad97..583254ed 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/admin/system/SysDicController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/admin/system/SysDicController.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chatopera.cc.handler.admin.system; +package com.chatopera.cc.controller.admin.system; import com.chatopera.cc.cache.Cache; -import com.chatopera.cc.handler.Handler; +import com.chatopera.cc.controller.Handler; import com.chatopera.cc.model.SysDic; import com.chatopera.cc.persistence.repository.SysDicRepository; import com.chatopera.cc.util.Menu; diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/admin/system/TemplateController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/admin/system/TemplateController.java similarity index 96% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/admin/system/TemplateController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/admin/system/TemplateController.java index 5dd8b8aa..2fd62652 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/admin/system/TemplateController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/admin/system/TemplateController.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chatopera.cc.handler.admin.system; +package com.chatopera.cc.controller.admin.system; import com.chatopera.cc.basic.MainUtils; import com.chatopera.cc.cache.Cache; -import com.chatopera.cc.handler.Handler; +import com.chatopera.cc.controller.Handler; import com.chatopera.cc.model.SysDic; import com.chatopera.cc.model.Template; import com.chatopera.cc.model.Dict; diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/api/ApiAgentUserController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/api/ApiAgentUserController.java similarity index 95% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/api/ApiAgentUserController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/api/ApiAgentUserController.java index d03a014f..7f754334 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/api/ApiAgentUserController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/api/ApiAgentUserController.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chatopera.cc.handler.api; +package com.chatopera.cc.controller.api; import com.chatopera.cc.acd.AutomaticServiceDist; import com.chatopera.cc.basic.MainContext.*; import com.chatopera.cc.basic.MainUtils; import com.chatopera.cc.cache.Cache; import com.chatopera.cc.exception.CSKefuException; -import com.chatopera.cc.handler.Handler; -import com.chatopera.cc.handler.api.request.RestUtils; +import com.chatopera.cc.controller.Handler; +import com.chatopera.cc.controller.api.request.RestUtils; import com.chatopera.cc.model.*; import com.chatopera.cc.peer.PeerSyncIM; import com.chatopera.cc.persistence.repository.AgentServiceRepository; @@ -167,6 +167,9 @@ public class ApiAgentUserController extends Handler { // 当前访客的ID final String userId = agentUser.getUserid(); + logger.info("[transout] agentuserid {} \n target agent id {}, \n current agent id {}, onlineuserid {}", agentUserId, transAgentId, currentAgentno, userId); + + // 检查权限 if ((!logined.isAdmin()) && (!StringUtils.equals( agentUser.getAgentno(), diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/api/ApiAppsController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/api/ApiAppsController.java similarity index 97% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/api/ApiAppsController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/api/ApiAppsController.java index ffd22404..e385ce15 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/api/ApiAppsController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/api/ApiAppsController.java @@ -8,12 +8,12 @@ * publish, or display any part, in any form, or by any means. Reverse engineering, disassembly, * or decompilation of this software, unless required by law for interoperability, is prohibited. */ -package com.chatopera.cc.handler.api; +package com.chatopera.cc.controller.api; import com.chatopera.cc.basic.MainContext; import com.chatopera.cc.cache.Cache; -import com.chatopera.cc.handler.Handler; -import com.chatopera.cc.handler.api.request.RestUtils; +import com.chatopera.cc.controller.Handler; +import com.chatopera.cc.controller.api.request.RestUtils; import com.chatopera.cc.model.InviteRecord; import com.chatopera.cc.model.OnlineUser; import com.chatopera.cc.persistence.repository.InviteRecordRepository; diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/api/ApiChatMessageController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/api/ApiChatMessageController.java similarity index 94% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/api/ApiChatMessageController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/api/ApiChatMessageController.java index 10cc6905..494e1b3f 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/api/ApiChatMessageController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/api/ApiChatMessageController.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chatopera.cc.handler.api; +package com.chatopera.cc.controller.api; -import com.chatopera.cc.handler.Handler; +import com.chatopera.cc.controller.Handler; import com.chatopera.cc.persistence.repository.ChatMessageRepository; import com.chatopera.cc.util.Menu; import com.chatopera.cc.util.RestResult; diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/api/ApiContactNotesController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/api/ApiContactNotesController.java similarity index 98% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/api/ApiContactNotesController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/api/ApiContactNotesController.java index 4cc407fa..b4f426a4 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/api/ApiContactNotesController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/api/ApiContactNotesController.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chatopera.cc.handler.api; +package com.chatopera.cc.controller.api; import com.chatopera.cc.basic.MainContext; import com.chatopera.cc.basic.MainUtils; -import com.chatopera.cc.handler.Handler; -import com.chatopera.cc.handler.api.request.RestUtils; +import com.chatopera.cc.controller.Handler; +import com.chatopera.cc.controller.api.request.RestUtils; import com.chatopera.cc.model.*; import com.chatopera.cc.persistence.es.ContactNotesRepository; import com.chatopera.cc.persistence.es.ContactsRepository; diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/api/ApiContactTagsController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/api/ApiContactTagsController.java similarity index 98% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/api/ApiContactTagsController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/api/ApiContactTagsController.java index b1d9b0a7..2e3f57c6 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/api/ApiContactTagsController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/api/ApiContactTagsController.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.chatopera.cc.handler.api; +package com.chatopera.cc.controller.api; import com.chatopera.cc.basic.MainContext; -import com.chatopera.cc.handler.Handler; -import com.chatopera.cc.handler.api.request.RestUtils; +import com.chatopera.cc.controller.Handler; +import com.chatopera.cc.controller.api.request.RestUtils; import com.chatopera.cc.model.Tag; import com.chatopera.cc.model.TagRelation; import com.chatopera.cc.persistence.repository.TagRelationRepository; diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/api/ApiContactsController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/api/ApiContactsController.java similarity index 82% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/api/ApiContactsController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/api/ApiContactsController.java index 7a1b3250..4518ffd6 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/api/ApiContactsController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/api/ApiContactsController.java @@ -14,15 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chatopera.cc.handler.api; +package com.chatopera.cc.controller.api; import com.chatopera.cc.basic.MainContext; import com.chatopera.cc.exception.CSKefuException; -import com.chatopera.cc.handler.Handler; -import com.chatopera.cc.handler.api.request.RestUtils; +import com.chatopera.cc.controller.Handler; +import com.chatopera.cc.controller.api.request.RestUtils; import com.chatopera.cc.model.*; import com.chatopera.cc.persistence.es.ContactsRepository; import com.chatopera.cc.persistence.repository.SNSAccountRepository; +import com.chatopera.cc.proxy.AgentUserProxy; import com.chatopera.cc.proxy.ContactsProxy; import com.chatopera.cc.util.Menu; import com.chatopera.cc.util.RestResult; @@ -69,7 +70,7 @@ public class ApiContactsController extends Handler { private ContactsProxy contactsProxy; @Autowired - private SNSAccountRepository snsAccountRes; + private AgentUserProxy agentUserProxy; /** * 返回用户列表，支持分页，分页参数为 p=1&ps=50，默认分页尺寸为 20条每页 @@ -167,7 +168,10 @@ public class ApiContactsController extends Handler { // 查找立即触达的渠道 json = approach(j, logined); break; - + case "proactive": + // 与联系开始聊天 + json = proactive(j, logined); + break; default: json.addProperty(RestUtils.RESP_KEY_RC, RestUtils.RESP_RC_FAIL_2); json.addProperty(RestUtils.RESP_KEY_ERROR, "不合法的操作。"); @@ -177,6 +181,40 @@ public class ApiContactsController extends Handler { return new ResponseEntity(json.toString(), headers, HttpStatus.OK); } + /** + * 主动与联系人聊天 + * + * @param payload + * @param logined + * @return + */ + private JsonObject proactive(final JsonObject payload, User logined) { + JsonObject resp = new JsonObject(); + + final String channels = payload.has("channels") ? payload.get("channels").getAsString() : null; + final String contactid = payload.has("contactid") ? payload.get("contactid").getAsString() : null; + + if (StringUtils.isBlank(channels) || StringUtils.isBlank(contactid)) { + resp.addProperty(RestUtils.RESP_KEY_RC, RestUtils.RESP_RC_FAIL_3); + resp.addProperty(RestUtils.RESP_KEY_ERROR, "Invalid params."); + return resp; + } + + try { + AgentUser agentUser = agentUserProxy.figureAgentUserBeforeChatWithContactInfo(channels, contactid, logined); + resp.addProperty(RestUtils.RESP_KEY_RC, RestUtils.RESP_RC_SUCC); + JsonObject data = new JsonObject(); + data.addProperty("agentuserid", agentUser.getId()); + resp.add(RestUtils.RESP_KEY_DATA, data); + } catch (CSKefuException e) { + resp.addProperty(RestUtils.RESP_KEY_RC, RestUtils.RESP_RC_FAIL_4); + resp.addProperty(RestUtils.RESP_KEY_ERROR, "Can not create agent user."); + return resp; + } + + return resp; + } + /** * 根据联系人信息查找立即触达的渠道 * diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/api/ApiLeavemsgController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/api/ApiLeavemsgController.java similarity index 95% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/api/ApiLeavemsgController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/api/ApiLeavemsgController.java index 116f2d72..4bde1198 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/api/ApiLeavemsgController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/api/ApiLeavemsgController.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chatopera.cc.handler.api; +package com.chatopera.cc.controller.api; import com.chatopera.cc.basic.MainContext; -import com.chatopera.cc.handler.Handler; +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; diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/api/ApiOnlineUserController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/api/ApiOnlineUserController.java similarity index 94% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/api/ApiOnlineUserController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/api/ApiOnlineUserController.java index 59b73026..62dd52ad 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/api/ApiOnlineUserController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/api/ApiOnlineUserController.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chatopera.cc.handler.api; +package com.chatopera.cc.controller.api; import com.chatopera.cc.basic.MainContext; -import com.chatopera.cc.handler.Handler; +import com.chatopera.cc.controller.Handler; import com.chatopera.cc.model.OnlineUser; import com.chatopera.cc.persistence.repository.OnlineUserRepository; import com.chatopera.cc.util.Menu; diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/api/ApiOrganController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/api/ApiOrganController.java similarity index 94% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/api/ApiOrganController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/api/ApiOrganController.java index c010fec4..a10239f7 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/api/ApiOrganController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/api/ApiOrganController.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chatopera.cc.handler.api; +package com.chatopera.cc.controller.api; -import com.chatopera.cc.handler.Handler; +import com.chatopera.cc.controller.Handler; import com.chatopera.cc.model.Organ; import com.chatopera.cc.persistence.repository.OrganRepository; import com.chatopera.cc.util.Menu; diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/api/ApiQualityController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/api/ApiQualityController.java similarity index 95% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/api/ApiQualityController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/api/ApiQualityController.java index dde0619c..53deb994 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/api/ApiQualityController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/api/ApiQualityController.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chatopera.cc.handler.api; +package com.chatopera.cc.controller.api; import com.chatopera.cc.basic.MainContext; -import com.chatopera.cc.handler.Handler; +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; diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/api/ApiQuickReplyController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/api/ApiQuickReplyController.java similarity index 95% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/api/ApiQuickReplyController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/api/ApiQuickReplyController.java index 7e1b46b5..930c78fd 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/api/ApiQuickReplyController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/api/ApiQuickReplyController.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chatopera.cc.handler.api; +package com.chatopera.cc.controller.api; -import com.chatopera.cc.handler.Handler; +import com.chatopera.cc.controller.Handler; import com.chatopera.cc.model.QuickReply; import com.chatopera.cc.persistence.es.QuickReplyRepository; import com.chatopera.cc.util.Menu; diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/api/ApiQuickTypeController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/api/ApiQuickTypeController.java similarity index 95% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/api/ApiQuickTypeController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/api/ApiQuickTypeController.java index 943ad374..3dcd063a 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/api/ApiQuickTypeController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/api/ApiQuickTypeController.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chatopera.cc.handler.api; +package com.chatopera.cc.controller.api; -import com.chatopera.cc.handler.Handler; +import com.chatopera.cc.controller.Handler; import com.chatopera.cc.model.QuickType; import com.chatopera.cc.persistence.es.QuickReplyRepository; import com.chatopera.cc.persistence.repository.QuickTypeRepository; diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/api/ApiServiceQueneController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/api/ApiServiceQueneController.java similarity index 97% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/api/ApiServiceQueneController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/api/ApiServiceQueneController.java index d984f9bf..3ecfd57b 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/api/ApiServiceQueneController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/api/ApiServiceQueneController.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chatopera.cc.handler.api; +package com.chatopera.cc.controller.api; import com.chatopera.cc.acd.AutomaticServiceDist; import com.chatopera.cc.basic.MainContext; import com.chatopera.cc.cache.Cache; -import com.chatopera.cc.handler.Handler; +import com.chatopera.cc.controller.Handler; import com.chatopera.cc.model.AgentStatus; import com.chatopera.cc.model.SessionConfig; import com.chatopera.cc.model.User; diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/api/ApiSysDicController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/api/ApiSysDicController.java similarity index 93% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/api/ApiSysDicController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/api/ApiSysDicController.java index ffff48b9..e10f18c6 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/api/ApiSysDicController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/api/ApiSysDicController.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chatopera.cc.handler.api; +package com.chatopera.cc.controller.api; -import com.chatopera.cc.handler.Handler; -import com.chatopera.cc.handler.admin.system.SysDicController; -import com.chatopera.cc.handler.api.request.RestUtils; +import com.chatopera.cc.controller.Handler; +import com.chatopera.cc.controller.admin.system.SysDicController; +import com.chatopera.cc.controller.api.request.RestUtils; import com.chatopera.cc.model.Dict; import com.chatopera.cc.model.SysDic; import com.chatopera.cc.model.User; diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/api/ApiTagsController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/api/ApiTagsController.java similarity index 97% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/api/ApiTagsController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/api/ApiTagsController.java index fb48a091..e90af10e 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/api/ApiTagsController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/api/ApiTagsController.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.chatopera.cc.handler.api; +package com.chatopera.cc.controller.api; -import com.chatopera.cc.handler.Handler; -import com.chatopera.cc.handler.api.request.RestUtils; +import com.chatopera.cc.controller.Handler; +import com.chatopera.cc.controller.api.request.RestUtils; import com.chatopera.cc.model.Tag; import com.chatopera.cc.persistence.repository.TagRepository; import com.chatopera.cc.exception.CSKefuRestException; diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/api/ApiUserController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/api/ApiUserController.java similarity index 96% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/api/ApiUserController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/api/ApiUserController.java index 6d1e534a..65e955b8 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/api/ApiUserController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/api/ApiUserController.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chatopera.cc.handler.api; +package com.chatopera.cc.controller.api; import com.chatopera.cc.basic.MainContext; import com.chatopera.cc.basic.MainUtils; import com.chatopera.cc.cache.Cache; -import com.chatopera.cc.handler.Handler; -import com.chatopera.cc.handler.api.request.RestUtils; +import com.chatopera.cc.controller.Handler; +import com.chatopera.cc.controller.api.request.RestUtils; import com.chatopera.cc.model.AgentStatus; import com.chatopera.cc.model.OrganUser; import com.chatopera.cc.model.User; @@ -174,7 +174,7 @@ public class ApiUserController extends Handler { case "update": json = update(request, j); break; - case "findByOrgan": + case "findbyorgan": json = findByOrgan(j); break; default: diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/api/ApiWebIMController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/api/ApiWebIMController.java similarity index 94% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/api/ApiWebIMController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/api/ApiWebIMController.java index da0326cc..88bb4624 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/api/ApiWebIMController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/api/ApiWebIMController.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chatopera.cc.handler.api; +package com.chatopera.cc.controller.api; -import com.chatopera.cc.handler.Handler; +import com.chatopera.cc.controller.Handler; import com.chatopera.cc.model.CousultInvite; import com.chatopera.cc.persistence.repository.ConsultInviteRepository; import com.chatopera.cc.util.Menu; diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/api/ApiWlContactsController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/api/ApiWlContactsController.java similarity index 98% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/api/ApiWlContactsController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/api/ApiWlContactsController.java index a211f552..35c8d77d 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/api/ApiWlContactsController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/api/ApiWlContactsController.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.chatopera.cc.handler.api; +package com.chatopera.cc.controller.api; import com.chatopera.cc.basic.Constants; import com.chatopera.cc.basic.MainUtils; -import com.chatopera.cc.handler.Handler; -import com.chatopera.cc.handler.api.request.RestUtils; +import com.chatopera.cc.controller.Handler; +import com.chatopera.cc.controller.api.request.RestUtils; import com.chatopera.cc.model.Contacts; import com.chatopera.cc.model.User; import com.chatopera.cc.persistence.es.ContactsRepository; diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/api/QueryParams.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/api/QueryParams.java similarity index 93% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/api/QueryParams.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/api/QueryParams.java index 1265c16e..bfd28356 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/api/QueryParams.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/api/QueryParams.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chatopera.cc.handler.api; +package com.chatopera.cc.controller.api; public class QueryParams { private String begin ; diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/api/RequestValues.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/api/RequestValues.java similarity index 93% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/api/RequestValues.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/api/RequestValues.java index 0e13ee07..8cf4548c 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/api/RequestValues.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/api/RequestValues.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chatopera.cc.handler.api; +package com.chatopera.cc.controller.api; import java.io.Serializable; diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/api/UkefuApiTagsController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/api/UkefuApiTagsController.java similarity index 93% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/api/UkefuApiTagsController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/api/UkefuApiTagsController.java index 40c854c7..aaeef5e7 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/api/UkefuApiTagsController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/api/UkefuApiTagsController.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chatopera.cc.handler.api; +package com.chatopera.cc.controller.api; import com.chatopera.cc.basic.MainContext; -import com.chatopera.cc.handler.Handler; +import com.chatopera.cc.controller.Handler; import com.chatopera.cc.persistence.repository.TagRepository; import com.chatopera.cc.util.Menu; import com.chatopera.cc.util.RestResult; diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/api/auth/ApiLoginController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/api/auth/ApiLoginController.java similarity index 95% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/api/auth/ApiLoginController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/api/auth/ApiLoginController.java index 5eec44f0..7f7c2f8e 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/api/auth/ApiLoginController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/api/auth/ApiLoginController.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chatopera.cc.handler.api.auth; +package com.chatopera.cc.controller.api.auth; import com.chatopera.cc.basic.MainUtils; import com.chatopera.cc.basic.auth.AuthToken; import com.chatopera.cc.cache.Cache; -import com.chatopera.cc.handler.Handler; +import com.chatopera.cc.controller.Handler; import com.chatopera.cc.model.User; import com.chatopera.cc.model.UserRole; import com.chatopera.cc.persistence.repository.UserRepository; diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/api/auth/ApiTokensErrorController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/api/auth/ApiTokensErrorController.java similarity index 92% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/api/auth/ApiTokensErrorController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/api/auth/ApiTokensErrorController.java index 335ab965..c7582dee 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/api/auth/ApiTokensErrorController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/api/auth/ApiTokensErrorController.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chatopera.cc.handler.api.auth; +package com.chatopera.cc.controller.api.auth; -import com.chatopera.cc.handler.Handler; +import com.chatopera.cc.controller.Handler; import com.chatopera.cc.util.Menu; import com.chatopera.cc.util.RestResult; import com.chatopera.cc.util.RestResultType; diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/api/request/QueryParams.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/api/request/QueryParams.java similarity index 92% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/api/request/QueryParams.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/api/request/QueryParams.java index 76766666..4b2545cb 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/api/request/QueryParams.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/api/request/QueryParams.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chatopera.cc.handler.api.request; +package com.chatopera.cc.controller.api.request; public class QueryParams { private String begin ; diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/api/request/RequestValues.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/api/request/RequestValues.java similarity index 92% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/api/request/RequestValues.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/api/request/RequestValues.java index ef8f6b37..372092cb 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/api/request/RequestValues.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/api/request/RequestValues.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chatopera.cc.handler.api.request; +package com.chatopera.cc.controller.api.request; import java.io.Serializable; diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/api/request/RestUtils.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/api/request/RestUtils.java similarity index 97% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/api/request/RestUtils.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/api/request/RestUtils.java index 7a2b4249..11cf3225 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/api/request/RestUtils.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/api/request/RestUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chatopera.cc.handler.api.request; +package com.chatopera.cc.controller.api.request; import org.springframework.http.HttpHeaders; diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/apps/AgentAuditController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/apps/AgentAuditController.java similarity index 84% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/apps/AgentAuditController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/apps/AgentAuditController.java index f80e6fab..bd55c04b 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/apps/AgentAuditController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/apps/AgentAuditController.java @@ -14,25 +14,25 @@ * limitations under the License. */ -package com.chatopera.cc.handler.apps; +package com.chatopera.cc.controller.apps; +import com.alibaba.fastjson.JSONObject; import com.chatopera.cc.acd.AutomaticServiceDist; +import com.chatopera.cc.activemq.BrokerPublisher; +import com.chatopera.cc.basic.Constants; import com.chatopera.cc.basic.MainUtils; import com.chatopera.cc.cache.Cache; import com.chatopera.cc.exception.CSKefuException; import com.chatopera.cc.model.*; import com.chatopera.cc.peer.PeerSyncIM; -import com.chatopera.cc.proxy.AgentServiceProxy; +import com.chatopera.cc.proxy.*; import com.chatopera.cc.basic.MainContext; -import com.chatopera.cc.handler.Handler; +import com.chatopera.cc.controller.Handler; import com.chatopera.cc.model.AgentUser; import com.chatopera.cc.model.Organ; import com.chatopera.cc.model.User; import com.chatopera.cc.persistence.es.QuickReplyRepository; import com.chatopera.cc.persistence.repository.*; -import com.chatopera.cc.proxy.AgentUserProxy; -import com.chatopera.cc.proxy.OnlineUserProxy; -import com.chatopera.cc.proxy.UserProxy; import com.chatopera.cc.socketio.message.Message; import com.chatopera.cc.util.Menu; import freemarker.template.TemplateException; @@ -111,6 +111,12 @@ public class AgentAuditController extends Handler { @Autowired private TagRelationRepository tagRelationRes; + @Autowired + private BlackEntityProxy blackEntityProxy; + + @Autowired + private BrokerPublisher brokerPublisher; + @Autowired private AgentServiceProxy agentServiceProxy; @@ -281,9 +287,9 @@ public class AgentAuditController extends Handler { view.addObject( "agentUserMessageList", this.chatMessageRepository.findByUsessionAndOrgi(agentUser.getUserid(), orgi, - new PageRequest(0, 20, Sort.Direction.DESC, - "updatetime" - ) + new PageRequest(0, 20, Sort.Direction.DESC, + "updatetime" + ) ) ); AgentService agentService = null; @@ -311,16 +317,15 @@ public class AgentAuditController extends Handler { } view.addObject("onlineUser", onlineUser); } - - view.addObject("serviceCount", Integer - .valueOf(this.agentServiceRes - .countByUseridAndOrgiAndStatus(agentUser - .getUserid(), orgi, - MainContext.AgentUserStatusEnum.END - .toString() - ))); } - + view.addObject("serviceCount", Integer + .valueOf(this.agentServiceRes + .countByUseridAndOrgiAndStatus(agentUser + .getUserid(), orgi, + MainContext.AgentUserStatusEnum.END + .toString()))); + view.addObject("tagRelationList", tagRelationRes.findByUserid(agentUser.getUserid())); + } SessionConfig sessionConfig = AutomaticServiceDist.initSessionConfig(super.getOrgi(request)); view.addObject("sessionConfig", sessionConfig); @@ -329,7 +334,6 @@ public class AgentAuditController extends Handler { } view.addObject("tags", tagRes.findByOrgiAndTagtype(orgi, MainContext.ModelType.USER.toString())); - } return view; } @@ -560,4 +564,88 @@ public class AgentAuditController extends Handler { return request(super.createRequestPageTempletResponse("redirect:/apps/cca/index.html")); } + + + /** + * 结束对话 + * 如果当前对话属于登录用户或登录用户为超级用户，则可以结束这个对话 + * + * @param request + * @param id + * @return + * @throws Exception + */ + @RequestMapping({"/end"}) + @Menu(type = "apps", subtype = "agent") + public ModelAndView end(HttpServletRequest request, @Valid String id) { + final String orgi = super.getOrgi(request); + final User logined = super.getUser(request); + + final AgentUser agentUser = agentUserRes.findByIdAndOrgi(id, orgi); + + if (agentUser != null) { + if ((StringUtils.equals( + logined.getId(), agentUser.getAgentno()) || logined.isAdmin())) { + // 删除访客-坐席关联关系，包括缓存 + try { + AutomaticServiceDist.deleteAgentUser(agentUser, orgi); + } catch (CSKefuException e) { + // 未能删除成功 + logger.error("[end]", e); + } + } else { + logger.info("[end] Permission not fulfill."); + } + } + + return request(super.createRequestPageTempletResponse("redirect:/apps/cca/index.html")); + } + + @RequestMapping({"/blacklist/add"}) + @Menu(type = "apps", subtype = "blacklist") + public ModelAndView blacklistadd(ModelMap map, HttpServletRequest request, @Valid String agentuserid, @Valid String agentserviceid, @Valid String userid) + throws Exception { + map.addAttribute("agentuserid", agentuserid); + map.addAttribute("agentserviceid", agentserviceid); + map.addAttribute("userid", userid); + map.addAttribute("agentUser", agentUserRes.findByIdAndOrgi(userid, super.getOrgi(request))); + return request(super.createRequestPageTempletResponse("/apps/cca/blacklistadd")); + } + + @RequestMapping({"/blacklist/save"}) + @Menu(type = "apps", subtype = "blacklist") + public ModelAndView blacklist( + HttpServletRequest request, + @Valid String agentuserid, + @Valid String agentserviceid, + @Valid String userid, + @Valid BlackEntity blackEntity) + throws Exception { + logger.info("[blacklist] userid {}", userid); + final User logined = super.getUser(request); + final String orgi = logined.getOrgi(); + + if (StringUtils.isBlank(userid)) { + throw new CSKefuException("Invalid userid"); + } + /** + * 添加黑名单 + * 一定时间后触发函数 + */ + JSONObject payload = new JSONObject(); + + int timeSeconds = blackEntity.getControltime() * 3600; + payload.put("userId", userid); + payload.put("orgi", orgi); + + // 更新或创建黑名单 + blackEntityProxy.updateOrCreateBlackEntity(blackEntity, logined, userid, orgi, agentserviceid, agentuserid); + + // 创建定时任务 取消拉黑 + brokerPublisher.send( + Constants.WEBIM_SOCKETIO_ONLINE_USER_BLACKLIST, payload.toJSONString(), false, timeSeconds); + + return end(request, agentuserid); + } + } diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/apps/AgentController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/apps/AgentController.java similarity index 96% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/apps/AgentController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/apps/AgentController.java index ba611c2b..d3ee2e87 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/apps/AgentController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/apps/AgentController.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package com.chatopera.cc.handler.apps; + package com.chatopera.cc.controller.apps; import com.alibaba.fastjson.JSONObject; import com.chatopera.cc.acd.AutomaticServiceDist; @@ -24,7 +24,7 @@ import com.chatopera.cc.basic.MainUtils; import com.chatopera.cc.cache.Cache; import com.chatopera.cc.exception.CSKefuException; - import com.chatopera.cc.handler.Handler; + import com.chatopera.cc.controller.Handler; import com.chatopera.cc.model.*; import com.chatopera.cc.peer.PeerSyncIM; import com.chatopera.cc.persistence.blob.JpaBlobHelper; @@ -1115,14 +1115,14 @@ final List skillGroups = OnlineUserProxy.organ(orgi, true); // DEBUG -// StringBuffer sb = new StringBuffer(); -// for(final Organ organ: skillGroups){ -// sb.append(organ.getId()); -// sb.append(":"); -// sb.append(organ.getName()); -// sb.append("\t"); -// } -// logger.info("[transfer] skillGroups {}", sb.toString()); + StringBuffer sb = new StringBuffer(); + for (final Organ organ : skillGroups) { + sb.append(organ.getId()); + sb.append(":"); + sb.append(organ.getName()); + sb.append("\t"); + } + logger.info("[transfer] skillGroups {}", sb.toString()); // 选择当前用户的默认技能组 @@ -1134,7 +1134,7 @@ currentOrgan = skillGroups.get(0).getId(); } } -// logger.info("[transfer] set current organ as {}", currentOrgan); + logger.info("[transfer] set current organ as {}", currentOrgan); // 列出所有在线的坐席，排除本身 @@ -1149,7 +1149,7 @@ } } -// logger.info("[transfer] get all userids except mine, {}", StringUtils.join(userids, "\t")); + logger.info("[transfer] get all userids except mine, {}", StringUtils.join(userids, "\t")); final List userList = userRes.findAll(userids); for (final User o : userList) { diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/apps/AgentQualityController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/apps/AgentQualityController.java similarity index 96% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/apps/AgentQualityController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/apps/AgentQualityController.java index 47d0d6a8..f50a8d41 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/apps/AgentQualityController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/apps/AgentQualityController.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package com.chatopera.cc.handler.apps; +package com.chatopera.cc.controller.apps; import com.chatopera.cc.acd.AutomaticServiceDist; import com.chatopera.cc.basic.MainContext; import com.chatopera.cc.cache.Cache; -import com.chatopera.cc.handler.Handler; +import com.chatopera.cc.controller.Handler; import com.chatopera.cc.model.Quality; import com.chatopera.cc.model.QualityRequest; import com.chatopera.cc.model.SessionConfig; diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/apps/AgentSettingsController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/apps/AgentSettingsController.java similarity index 97% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/apps/AgentSettingsController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/apps/AgentSettingsController.java index 5ad17aea..e57ad174 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/apps/AgentSettingsController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/apps/AgentSettingsController.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chatopera.cc.handler.apps; +package com.chatopera.cc.controller.apps; import com.chatopera.cc.acd.AutomaticServiceDist; import com.chatopera.cc.basic.MainContext; import com.chatopera.cc.basic.MainUtils; import com.chatopera.cc.cache.Cache; -import com.chatopera.cc.handler.Handler; +import com.chatopera.cc.controller.Handler; import com.chatopera.cc.model.*; import com.chatopera.cc.persistence.repository.*; import com.chatopera.cc.basic.Constants; diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/apps/AppsController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/apps/AppsController.java similarity index 96% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/apps/AppsController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/apps/AppsController.java index 349ca9e1..1bbed3e3 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/apps/AppsController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/apps/AppsController.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chatopera.cc.handler.apps; +package com.chatopera.cc.controller.apps; import com.chatopera.cc.acd.AutomaticServiceDist; import com.chatopera.cc.basic.MainContext; import com.chatopera.cc.basic.MainUtils; import com.chatopera.cc.cache.Cache; -import com.chatopera.cc.handler.Handler; +import com.chatopera.cc.controller.Handler; import com.chatopera.cc.model.*; import com.chatopera.cc.persistence.es.ContactsRepository; import com.chatopera.cc.persistence.repository.OnlineUserRepository; @@ -230,6 +230,8 @@ public class AppsController extends Handler { public ModelAndView profile(ModelMap map, HttpServletRequest request, @Valid User user, @Valid String index) { User tempUser = userRes.getOne(user.getId()); final User logined = super.getUser(request); + // 用户名不可修改 + user.setUsername(logined.getUsername()); if (tempUser != null) { String msg = userProxy.validUserUpdate(user, tempUser); diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/apps/ContactsController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/apps/ContactsController.java similarity index 97% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/apps/ContactsController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/apps/ContactsController.java index a6e366b1..f178dd0a 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/apps/ContactsController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/apps/ContactsController.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chatopera.cc.handler.apps; +package com.chatopera.cc.controller.apps; import com.chatopera.cc.basic.MainUtils; import com.chatopera.cc.exception.CSKefuException; -import com.chatopera.cc.handler.Handler; +import com.chatopera.cc.controller.Handler; import com.chatopera.cc.model.Contacts; import com.chatopera.cc.model.MetadataTable; import com.chatopera.cc.model.PropertiesEvent; diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/apps/CustomerController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/apps/CustomerController.java similarity index 97% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/apps/CustomerController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/apps/CustomerController.java index b76ab8b8..38d782b9 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/apps/CustomerController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/apps/CustomerController.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package com.chatopera.cc.handler.apps; +package com.chatopera.cc.controller.apps; import com.chatopera.cc.basic.MainContext; import com.chatopera.cc.basic.MainUtils; -import com.chatopera.cc.handler.Handler; +import com.chatopera.cc.controller.Handler; import com.chatopera.cc.model.*; import com.chatopera.cc.persistence.es.ContactsRepository; import com.chatopera.cc.persistence.es.EntCustomerRepository; diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/apps/EntIMController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/apps/EntIMController.java similarity index 97% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/apps/EntIMController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/apps/EntIMController.java index 2f483b4c..c30bacff 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/apps/EntIMController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/apps/EntIMController.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package com.chatopera.cc.handler.apps; +package com.chatopera.cc.controller.apps; import com.chatopera.cc.basic.Constants; import com.chatopera.cc.basic.MainContext; import com.chatopera.cc.basic.MainUtils; -import com.chatopera.cc.handler.Handler; +import com.chatopera.cc.controller.Handler; import com.chatopera.cc.model.*; import com.chatopera.cc.peer.PeerSyncEntIM; import com.chatopera.cc.persistence.blob.JpaBlobHelper; diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/apps/ExtentionController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/apps/ExtentionController.java similarity index 96% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/apps/ExtentionController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/apps/ExtentionController.java index 796dec13..4feac47b 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/apps/ExtentionController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/apps/ExtentionController.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.chatopera.cc.handler.apps; +package com.chatopera.cc.controller.apps; import java.util.List; @@ -43,7 +43,7 @@ import com.chatopera.cc.persistence.repository.ExtentionRepository; import com.chatopera.cc.persistence.repository.RouterRulesRepository; import com.chatopera.cc.persistence.repository.SipTrunkRepository; import com.chatopera.cc.persistence.repository.SkillExtentionRepository; -import com.chatopera.cc.handler.Handler; +import com.chatopera.cc.controller.Handler; import com.chatopera.cc.model.SystemConfig; @Controller diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/apps/IMController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/apps/IMController.java similarity index 97% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/apps/IMController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/apps/IMController.java index cacadfc0..b0dd96cc 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/apps/IMController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/apps/IMController.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.chatopera.cc.handler.apps; +package com.chatopera.cc.controller.apps; import com.chatopera.cc.proxy.OnlineUserProxy; import com.chatopera.cc.acd.AutomaticServiceDist; @@ -23,7 +23,7 @@ import com.chatopera.cc.basic.Constants; import com.chatopera.cc.basic.MainContext; import com.chatopera.cc.basic.MainUtils; import com.chatopera.cc.cache.Cache; -import com.chatopera.cc.handler.Handler; +import com.chatopera.cc.controller.Handler; import com.chatopera.cc.socketio.util.RichMediaUtils; import com.chatopera.cc.model.*; import com.chatopera.cc.persistence.blob.JpaBlobHelper; diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/apps/JobController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/apps/JobController.java similarity index 94% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/apps/JobController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/apps/JobController.java index 69457b52..90d3b74c 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/apps/JobController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/apps/JobController.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.chatopera.cc.handler.apps; +package com.chatopera.cc.controller.apps; import java.text.ParseException; import java.util.Date; @@ -35,7 +35,7 @@ import org.springframework.web.servlet.ModelAndView; import com.fasterxml.jackson.databind.ObjectMapper; import com.chatopera.cc.persistence.repository.JobDetailRepository; -import com.chatopera.cc.handler.Handler; +import com.chatopera.cc.controller.Handler; @Controller diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/apps/KbsController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/apps/KbsController.java similarity index 96% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/apps/KbsController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/apps/KbsController.java index 71d00614..858af305 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/apps/KbsController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/apps/KbsController.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.chatopera.cc.handler.apps; +package com.chatopera.cc.controller.apps; import java.io.File; import java.io.IOException; @@ -30,7 +30,7 @@ import com.chatopera.cc.persistence.es.KbsTopicRepository; import com.chatopera.cc.persistence.repository.AttachmentRepository; import com.chatopera.cc.persistence.repository.KbsTypeRepository; import com.chatopera.cc.persistence.repository.TagRepository; -import com.chatopera.cc.handler.Handler; +import com.chatopera.cc.controller.Handler; import com.chatopera.cc.model.AttachmentFile; import com.chatopera.cc.model.KbsTopic; import com.chatopera.cc.model.KbsType; diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/apps/MessageController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/apps/MessageController.java similarity index 91% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/apps/MessageController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/apps/MessageController.java index 9a02db97..7ec67512 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/apps/MessageController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/apps/MessageController.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.chatopera.cc.handler.apps; +package com.chatopera.cc.controller.apps; import javax.servlet.http.HttpServletRequest; @@ -25,7 +25,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; import com.chatopera.cc.util.Menu; -import com.chatopera.cc.handler.Handler; +import com.chatopera.cc.controller.Handler; @Controller @RequestMapping("/message") diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/apps/OrganizationController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/apps/OrganizationController.java similarity index 95% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/apps/OrganizationController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/apps/OrganizationController.java index 67e9f1f2..dc22a300 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/apps/OrganizationController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/apps/OrganizationController.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.chatopera.cc.handler.apps; +package com.chatopera.cc.controller.apps; import java.io.IOException; import java.security.NoSuchAlgorithmException; @@ -26,7 +26,7 @@ import javax.validation.Valid; import com.chatopera.cc.basic.MainUtils; import com.chatopera.cc.util.Menu; import com.chatopera.cc.persistence.repository.OrganizationRepository; -import com.chatopera.cc.handler.Handler; +import com.chatopera.cc.controller.Handler; import com.chatopera.cc.model.Organization; import com.chatopera.cc.model.User; import org.apache.commons.lang.StringUtils; diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/apps/QuickReplyController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/apps/QuickReplyController.java similarity index 97% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/apps/QuickReplyController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/apps/QuickReplyController.java index 9dab8bd4..48282ff8 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/apps/QuickReplyController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/apps/QuickReplyController.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chatopera.cc.handler.apps; +package com.chatopera.cc.controller.apps; import java.io.File; import java.io.IOException; @@ -42,7 +42,7 @@ import com.chatopera.cc.persistence.es.QuickReplyRepository; import com.chatopera.cc.persistence.repository.MetadataRepository; import com.chatopera.cc.persistence.repository.QuickTypeRepository; import com.chatopera.cc.persistence.repository.ReporterRepository; -import com.chatopera.cc.handler.Handler; +import com.chatopera.cc.controller.Handler; import com.chatopera.cc.model.MetadataTable; import com.chatopera.cc.model.QuickReply; import org.apache.commons.io.FileUtils; diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/apps/SipTrunkController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/apps/SipTrunkController.java similarity index 96% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/apps/SipTrunkController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/apps/SipTrunkController.java index 32ccd753..ce72194d 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/apps/SipTrunkController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/apps/SipTrunkController.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package com.chatopera.cc.handler.apps; +package com.chatopera.cc.controller.apps; import com.chatopera.cc.cache.Cache; -import com.chatopera.cc.handler.Handler; +import com.chatopera.cc.controller.Handler; import com.chatopera.cc.model.SipTrunk; import com.chatopera.cc.model.User; import com.chatopera.cc.proxy.CallcenterOutboundProxy; diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/apps/TenantController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/apps/TenantController.java similarity index 97% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/apps/TenantController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/apps/TenantController.java index f020f7f2..f835de94 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/apps/TenantController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/apps/TenantController.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chatopera.cc.handler.apps; +package com.chatopera.cc.controller.apps; import com.chatopera.cc.basic.MainContext; import com.chatopera.cc.cache.Cache; -import com.chatopera.cc.handler.Handler; +import com.chatopera.cc.controller.Handler; import com.chatopera.cc.model.*; import com.chatopera.cc.persistence.repository.*; import com.chatopera.cc.proxy.OnlineUserProxy; diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/apps/TopicController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/apps/TopicController.java similarity index 97% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/apps/TopicController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/apps/TopicController.java index 3985bc44..b91510d7 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/apps/TopicController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/apps/TopicController.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.chatopera.cc.handler.apps; +package com.chatopera.cc.controller.apps; import java.io.File; import java.io.IOException; @@ -64,7 +64,7 @@ import com.chatopera.cc.persistence.repository.AreaTypeRepository; import com.chatopera.cc.persistence.repository.KnowledgeTypeRepository; import com.chatopera.cc.persistence.repository.MetadataRepository; import com.chatopera.cc.persistence.repository.ReporterRepository; -import com.chatopera.cc.handler.Handler; +import com.chatopera.cc.controller.Handler; import com.chatopera.cc.model.MetadataTable; import com.chatopera.cc.model.Dict; diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/apps/report/CubeController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/apps/report/CubeController.java similarity index 97% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/apps/report/CubeController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/apps/report/CubeController.java index 6beac8a6..ee6ffbdb 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/apps/report/CubeController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/apps/report/CubeController.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chatopera.cc.handler.apps.report; +package com.chatopera.cc.controller.apps.report; import java.util.Date; import java.util.List; @@ -41,7 +41,7 @@ import com.chatopera.cc.persistence.repository.CubeTypeRepository; import com.chatopera.cc.persistence.repository.DimensionRepository; import com.chatopera.cc.persistence.repository.MetadataRepository; import com.chatopera.cc.persistence.repository.PublishedCubeRepository; -import com.chatopera.cc.handler.Handler; +import com.chatopera.cc.controller.Handler; import com.chatopera.cc.model.Cube; import com.chatopera.cc.model.CubeMeasure; import com.chatopera.cc.model.CubeMetadata; diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/apps/report/CubeLevelController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/apps/report/CubeLevelController.java similarity index 96% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/apps/report/CubeLevelController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/apps/report/CubeLevelController.java index fd21a024..f5ab48d5 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/apps/report/CubeLevelController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/apps/report/CubeLevelController.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chatopera.cc.handler.apps.report; +package com.chatopera.cc.controller.apps.report; import java.util.List; @@ -35,7 +35,7 @@ import org.springframework.web.servlet.ModelAndView; import com.chatopera.cc.util.Menu; import com.chatopera.cc.persistence.repository.CubeLevelRepository; import com.chatopera.cc.persistence.repository.TablePropertiesRepository; -import com.chatopera.cc.handler.Handler; +import com.chatopera.cc.controller.Handler; import com.chatopera.cc.model.CubeLevel; import com.chatopera.cc.model.CubeMetadata; diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/apps/report/CubeMeasureController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/apps/report/CubeMeasureController.java similarity index 96% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/apps/report/CubeMeasureController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/apps/report/CubeMeasureController.java index 334e9fe5..d71b2058 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/apps/report/CubeMeasureController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/apps/report/CubeMeasureController.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chatopera.cc.handler.apps.report; +package com.chatopera.cc.controller.apps.report; import java.util.List; @@ -32,7 +32,7 @@ import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; -import com.chatopera.cc.handler.Handler; +import com.chatopera.cc.controller.Handler; import com.chatopera.cc.model.CubeMeasure; import com.chatopera.cc.model.CubeMetadata; diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/apps/report/DimensionController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/apps/report/DimensionController.java similarity index 96% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/apps/report/DimensionController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/apps/report/DimensionController.java index 810e1a19..0821ef8c 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/apps/report/DimensionController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/apps/report/DimensionController.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chatopera.cc.handler.apps.report; +package com.chatopera.cc.controller.apps.report; import java.util.List; @@ -34,7 +34,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; import com.chatopera.cc.persistence.repository.CubeLevelRepository; -import com.chatopera.cc.handler.Handler; +import com.chatopera.cc.controller.Handler; import com.chatopera.cc.model.CubeLevel; import com.chatopera.cc.model.CubeMetadata; diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/apps/report/ReportController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/apps/report/ReportController.java similarity index 97% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/apps/report/ReportController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/apps/report/ReportController.java index 5469041e..94fffdf2 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/apps/report/ReportController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/apps/report/ReportController.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chatopera.cc.handler.apps.report; +package com.chatopera.cc.controller.apps.report; import java.io.File; import java.io.IOException; @@ -56,7 +56,7 @@ import com.chatopera.cc.persistence.repository.DataDicRepository; import com.chatopera.cc.persistence.repository.MetadataRepository; import com.chatopera.cc.persistence.repository.ReportCubeService; import com.chatopera.cc.persistence.repository.ReportRepository; -import com.chatopera.cc.handler.Handler; +import com.chatopera.cc.controller.Handler; import com.chatopera.cc.model.DataDic; import com.chatopera.cc.model.MetadataTable; import com.chatopera.cc.model.PublishedReport; diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/apps/report/ReportDesignController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/apps/report/ReportDesignController.java similarity index 97% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/apps/report/ReportDesignController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/apps/report/ReportDesignController.java index 395a2a3a..07c62b59 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/apps/report/ReportDesignController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/apps/report/ReportDesignController.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chatopera.cc.handler.apps.report; +package com.chatopera.cc.controller.apps.report; import java.util.ArrayList; import java.util.Date; @@ -51,7 +51,7 @@ import com.chatopera.cc.persistence.repository.ReportRepository; import com.chatopera.cc.persistence.repository.SysDicRepository; import com.chatopera.cc.persistence.repository.TablePropertiesRepository; import com.chatopera.cc.persistence.repository.TemplateRepository; -import com.chatopera.cc.handler.Handler; +import com.chatopera.cc.controller.Handler; import com.chatopera.cc.model.ChartProperties; import com.chatopera.cc.model.ColumnProperties; import com.chatopera.cc.model.Cube; diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/apps/report/ReportViewController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/apps/report/ReportViewController.java similarity index 95% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/apps/report/ReportViewController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/apps/report/ReportViewController.java index b19ae475..c8cfd821 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/apps/report/ReportViewController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/apps/report/ReportViewController.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chatopera.cc.handler.apps.report; +package com.chatopera.cc.controller.apps.report; import java.util.HashMap; import java.util.List; @@ -37,7 +37,7 @@ import org.springframework.web.servlet.ModelAndView; import com.chatopera.cc.util.Menu; import com.chatopera.cc.persistence.repository.DataDicRepository; import com.chatopera.cc.persistence.repository.ReportCubeService; -import com.chatopera.cc.handler.Handler; +import com.chatopera.cc.controller.Handler; import com.chatopera.cc.model.PublishedReport; import com.chatopera.cc.model.ReportFilter; diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/apps/service/AgentSummaryController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/apps/service/AgentSummaryController.java similarity index 97% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/apps/service/AgentSummaryController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/apps/service/AgentSummaryController.java index a1dcee23..bbc79eb6 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/apps/service/AgentSummaryController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/apps/service/AgentSummaryController.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chatopera.cc.handler.apps.service; +package com.chatopera.cc.controller.apps.service; import java.io.IOException; import java.text.ParseException; @@ -54,7 +54,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; import com.chatopera.cc.persistence.repository.MetadataRepository; -import com.chatopera.cc.handler.Handler; +import com.chatopera.cc.controller.Handler; import com.chatopera.cc.model.AgentService; import com.chatopera.cc.model.Contacts; import com.chatopera.cc.model.MetadataTable; diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/apps/service/ChatServiceController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/apps/service/ChatServiceController.java similarity index 97% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/apps/service/ChatServiceController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/apps/service/ChatServiceController.java index 27be4a43..53cd9eca 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/apps/service/ChatServiceController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/apps/service/ChatServiceController.java @@ -14,17 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chatopera.cc.handler.apps.service; +package com.chatopera.cc.controller.apps.service; import com.chatopera.cc.acd.AutomaticServiceDist; import com.chatopera.cc.basic.MainContext; import com.chatopera.cc.basic.MainUtils; import com.chatopera.cc.cache.Cache; -import com.chatopera.cc.handler.Handler; +import com.chatopera.cc.controller.Handler; import com.chatopera.cc.model.*; import com.chatopera.cc.peer.PeerSyncIM; import com.chatopera.cc.persistence.repository.*; -import com.chatopera.cc.proxy.AgentAuditProxy; import com.chatopera.cc.proxy.OnlineUserProxy; import com.chatopera.cc.proxy.UserProxy; import com.chatopera.cc.socketio.message.Message; diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/apps/service/CommentController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/apps/service/CommentController.java similarity index 93% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/apps/service/CommentController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/apps/service/CommentController.java index 92b052ce..6956820b 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/apps/service/CommentController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/apps/service/CommentController.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chatopera.cc.handler.apps.service; +package com.chatopera.cc.controller.apps.service; import javax.servlet.http.HttpServletRequest; import javax.validation.Valid; @@ -29,7 +29,7 @@ import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; -import com.chatopera.cc.handler.Handler; +import com.chatopera.cc.controller.Handler; import com.chatopera.cc.model.AgentService; @Controller diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/apps/service/OnlineUserController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/apps/service/OnlineUserController.java similarity index 96% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/apps/service/OnlineUserController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/apps/service/OnlineUserController.java index c8d854d2..60748b5f 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/apps/service/OnlineUserController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/apps/service/OnlineUserController.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chatopera.cc.handler.apps.service; +package com.chatopera.cc.controller.apps.service; import com.chatopera.cc.basic.MainContext; import com.chatopera.cc.basic.MainUtils; import com.chatopera.cc.cache.Cache; -import com.chatopera.cc.handler.Handler; +import com.chatopera.cc.controller.Handler; import com.chatopera.cc.model.*; import com.chatopera.cc.persistence.es.ContactsRepository; import com.chatopera.cc.persistence.repository.*; diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/apps/service/ProcessedSummaryController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/apps/service/ProcessedSummaryController.java similarity index 97% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/apps/service/ProcessedSummaryController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/apps/service/ProcessedSummaryController.java index 6168f34f..9f3695a5 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/apps/service/ProcessedSummaryController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/apps/service/ProcessedSummaryController.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chatopera.cc.handler.apps.service; +package com.chatopera.cc.controller.apps.service; import java.io.IOException; import java.text.SimpleDateFormat; @@ -52,7 +52,7 @@ import com.chatopera.cc.persistence.repository.AgentServiceRepository; import com.chatopera.cc.persistence.repository.MetadataRepository; import com.chatopera.cc.persistence.repository.ServiceSummaryRepository; import com.chatopera.cc.persistence.repository.TagRepository; -import com.chatopera.cc.handler.Handler; +import com.chatopera.cc.controller.Handler; import com.chatopera.cc.model.AgentService; import com.chatopera.cc.model.AgentServiceSummary; import com.chatopera.cc.model.Contacts; diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/apps/service/StatsController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/apps/service/StatsController.java similarity index 96% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/apps/service/StatsController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/apps/service/StatsController.java index 88b46ac9..44dd0a7e 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/apps/service/StatsController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/apps/service/StatsController.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chatopera.cc.handler.apps.service; +package com.chatopera.cc.controller.apps.service; import com.chatopera.cc.basic.MainUtils; -import com.chatopera.cc.handler.Handler; +import com.chatopera.cc.controller.Handler; import com.chatopera.cc.model.Dict; import com.chatopera.cc.model.SysDic; import com.chatopera.cc.persistence.repository.CubeService; diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/resource/CallAgentResourceController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/resource/CallAgentResourceController.java similarity index 94% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/resource/CallAgentResourceController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/resource/CallAgentResourceController.java index 2d709b72..8b3a69e6 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/resource/CallAgentResourceController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/resource/CallAgentResourceController.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chatopera.cc.handler.resource; +package com.chatopera.cc.controller.resource; import java.util.ArrayList; import java.util.List; @@ -31,7 +31,7 @@ import com.chatopera.cc.basic.Constants; import com.chatopera.cc.util.Menu; import com.chatopera.cc.persistence.repository.UserRepository; import com.chatopera.cc.util.CallCenterUtils; -import com.chatopera.cc.handler.Handler; +import com.chatopera.cc.controller.Handler; import com.chatopera.cc.model.User; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.jpa.domain.Specification; diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/resource/ContactsResourceController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/resource/ContactsResourceController.java similarity index 92% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/resource/ContactsResourceController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/resource/ContactsResourceController.java index bd4f8771..837f4afd 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/resource/ContactsResourceController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/resource/ContactsResourceController.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chatopera.cc.handler.resource; +package com.chatopera.cc.controller.resource; import javax.servlet.http.HttpServletRequest; import javax.validation.Valid; @@ -28,7 +28,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; import com.chatopera.cc.persistence.es.ContactsRepository; -import com.chatopera.cc.handler.Handler; +import com.chatopera.cc.controller.Handler; @Controller public class ContactsResourceController extends Handler{ diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/resource/CssResourceController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/resource/CssResourceController.java similarity index 92% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/resource/CssResourceController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/resource/CssResourceController.java index ac4643b0..b49aa908 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/resource/CssResourceController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/resource/CssResourceController.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chatopera.cc.handler.resource; +package com.chatopera.cc.controller.resource; import java.io.IOException; @@ -26,7 +26,7 @@ import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; -import com.chatopera.cc.handler.Handler; +import com.chatopera.cc.controller.Handler; @Controller public class CssResourceController extends Handler{ diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/resource/MediaController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/resource/MediaController.java similarity index 96% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/resource/MediaController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/resource/MediaController.java index 97715e37..c0bae1c8 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/resource/MediaController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/resource/MediaController.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chatopera.cc.handler.resource; +package com.chatopera.cc.controller.resource; import com.chatopera.cc.basic.MainUtils; -import com.chatopera.cc.handler.Handler; +import com.chatopera.cc.controller.Handler; import com.chatopera.cc.model.AttachmentFile; import com.chatopera.cc.model.StreamingFile; import com.chatopera.cc.model.UploadStatus; diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/resource/QuickReplyResourceController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/resource/QuickReplyResourceController.java similarity index 92% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/resource/QuickReplyResourceController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/resource/QuickReplyResourceController.java index 750d7910..bfe6b959 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/resource/QuickReplyResourceController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/resource/QuickReplyResourceController.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chatopera.cc.handler.resource; +package com.chatopera.cc.controller.resource; import java.io.IOException; @@ -28,7 +28,7 @@ import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; -import com.chatopera.cc.handler.Handler; +import com.chatopera.cc.controller.Handler; import freemarker.template.TemplateException; diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/resource/SysDicResourceController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/resource/SysDicResourceController.java similarity index 93% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/resource/SysDicResourceController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/resource/SysDicResourceController.java index 0d493f05..398e95e1 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/resource/SysDicResourceController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/resource/SysDicResourceController.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chatopera.cc.handler.resource; +package com.chatopera.cc.controller.resource; import java.io.IOException; import java.util.ArrayList; @@ -30,7 +30,7 @@ import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; -import com.chatopera.cc.handler.Handler; +import com.chatopera.cc.controller.Handler; import com.chatopera.cc.model.Dict; @Controller diff --git a/contact-center/app/src/main/java/com/chatopera/cc/handler/resource/UsersResourceController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/resource/UsersResourceController.java similarity index 95% rename from contact-center/app/src/main/java/com/chatopera/cc/handler/resource/UsersResourceController.java rename to contact-center/app/src/main/java/com/chatopera/cc/controller/resource/UsersResourceController.java index f00bc212..042268fe 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/handler/resource/UsersResourceController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/resource/UsersResourceController.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chatopera.cc.handler.resource; +package com.chatopera.cc.controller.resource; -import com.chatopera.cc.handler.Handler; +import com.chatopera.cc.controller.Handler; import com.chatopera.cc.model.Organ; import com.chatopera.cc.model.OrgiSkillRel; import com.chatopera.cc.model.User; diff --git a/contact-center/app/src/main/java/com/chatopera/cc/interceptor/LogIntercreptorHandler.java b/contact-center/app/src/main/java/com/chatopera/cc/interceptor/LogIntercreptorHandler.java index 2d70cca6..820c3348 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/interceptor/LogIntercreptorHandler.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/interceptor/LogIntercreptorHandler.java @@ -18,7 +18,7 @@ package com.chatopera.cc.interceptor; import com.chatopera.cc.basic.MainContext; import com.chatopera.cc.basic.MainUtils; -import com.chatopera.cc.handler.Handler; +import com.chatopera.cc.controller.Handler; import com.chatopera.cc.model.RequestLog; import com.chatopera.cc.model.User; import com.chatopera.cc.persistence.repository.RequestLogRepository; diff --git a/contact-center/app/src/main/java/com/chatopera/cc/proxy/OrganProxy.java b/contact-center/app/src/main/java/com/chatopera/cc/proxy/OrganProxy.java index 037990f9..a0ea0a54 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/proxy/OrganProxy.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/proxy/OrganProxy.java @@ -1,6 +1,6 @@ package com.chatopera.cc.proxy; -import com.chatopera.cc.handler.admin.OrganController; +import com.chatopera.cc.controller.admin.OrganController; import com.chatopera.cc.model.Organ; import com.chatopera.cc.model.User; import com.chatopera.cc.persistence.repository.OrganRepository; diff --git a/contact-center/app/src/main/java/com/chatopera/cc/socketio/handler/AgentEventHandler.java b/contact-center/app/src/main/java/com/chatopera/cc/socketio/handler/AgentEventHandler.java index 0e979088..0227bb1d 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/socketio/handler/AgentEventHandler.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/socketio/handler/AgentEventHandler.java @@ -277,15 +277,11 @@ public class AgentEventHandler { AgentUser agentUser = MainContext.getCache().findOneAgentUserByUserIdAndOrgi( received.getTouser(), received.getOrgi()).orElseGet(null); - AgentStatus agentStatus = MainContext.getCache().findOneAgentStatusByAgentnoAndOrig( - agentno, received.getOrgi()); - /** * 判断用户在线状态，如果用户在线则通过webim发送 * 检查收发双方的信息匹配 */ - if (agentStatus != null && - agentUser != null && + if (agentUser != null && agentno != null && StringUtils.equals(agentno, agentUser.getAgentno()) && !StringUtils.equals(agentUser.getStatus(), MainContext.AgentUserStatusEnum.END.toString())) { diff --git a/contact-center/app/src/main/resources/templates/apps/agent/transfer.html b/contact-center/app/src/main/resources/templates/apps/agent/transfer.html index 4e4e4598..ef08fa9c 100644 --- a/contact-center/app/src/main/resources/templates/apps/agent/transfer.html +++ b/contact-center/app/src/main/resources/templates/apps/agent/transfer.html @@ -19,8 +19,8 @@ <#list skillGroups as skill> <#if user.affiliates?seq_contains(skill.id)> <#assign agentNum = 0 > - <#if userList??><#list userList as agent><#if agent.affiliates?seq_contains(skill.id)><#assign agentNum = agentNum + 1 > -
  • <#list userList as agent><#if agent.skills[skill.id]??><#assign agentNum = agentNum + 1 > +
  • ${skill.name!''}(${agentNum!''}) @@ -33,7 +33,7 @@ <#list skillGroups as skill> <#if !user.affiliates?seq_contains(skill.id)> <#assign agentNum = 0 > - <#if userList??><#list userList as agent><#if agent.affiliates?seq_contains(skill.id)><#assign agentNum = agentNum + 1 > + <#if userList??><#list userList as agent><#if agent.skills[skill.id]??><#assign agentNum = agentNum + 1 >
  • ${skill.name!''}(${agentNum!''}) @@ -71,26 +71,12 @@
    - +
    diff --git a/contact-center/app/src/main/resources/templates/apps/business/contacts/embed/index.html b/contact-center/app/src/main/resources/templates/apps/business/contacts/embed/index.html index f2fdb029..4bbc3765 100644 --- a/contact-center/app/src/main/resources/templates/apps/business/contacts/embed/index.html +++ b/contact-center/app/src/main/resources/templates/apps/business/contacts/embed/index.html @@ -119,10 +119,11 @@ var form = layui.form(); form.on('submit(contactsForm)', function(data){ var targetIFrame = eval(iframe); - if($(":checked").val()){ - targetIFrame.Proxy.execLinkContactsFunction($(":checked").val()) ; + var selectedContactId = $("input:checked.ctxid").val(); + if(selectedContactId){ + targetIFrame.Proxy.execLinkContactsFunction(selectedContactId) ; }else { - const currentAgentUserContactsId = $("#currentContacsId").val(); + var currentAgentUserContactsId = $("#currentContacsId").val(); targetIFrame.Proxy.execCancelContactsFunction(currentAgentUserContactsId) ; } diff --git a/contact-center/app/src/main/resources/templates/apps/business/contacts/index.html b/contact-center/app/src/main/resources/templates/apps/business/contacts/index.html index 19a218bd..fc964515 100644 --- a/contact-center/app/src/main/resources/templates/apps/business/contacts/index.html +++ b/contact-center/app/src/main/resources/templates/apps/business/contacts/index.html @@ -296,19 +296,30 @@ }, silent: true }).then(function (data) { - // TODO 调试信息，查看网络请求次数 - // https://gitlab.chatopera.com/chatopera/cosinee/issues/596 if (data.rc == 0){ // 返回可用的触达渠道列表 data.data - if(multiMediaDialogWin.length>0){ - // TODO https://gitlab.chatopera.com/chatopera/cosinee/issues/619 - // 此处使用 attr(src, "url") 造成了刷屏，应该调整openDialogWinByContactid的返回结果 - // 然后异步加载新的对话数据，最后使用 tabChange 跳转到该页面 - parent.$('#multiMediaDialogWin').load(function(){ + if(multiMediaDialogWin.length > 0){ + multiMediaDialogWin.load(function(){ parent.layui.element().tabChange('ukefutab','multiMediaDialogWin'); }).attr('src' , '/agent/proactive.html?contactid='+id+'&channels='+data.data); } else { - parent.$('#agentdesktop').attr('data-href' , '/agent/proactive.html?contactid='+id+'&channels='+data.data).click(); + // 使用API调用，由SocketIO传达弹屏通知，跳转到该访客页面 + restApiRequest({ + path: 'contacts', + silent: true, + data: { + ops: 'proactive', + channels: data.data, + contactid: id + } + }).then(function(result){ + if(result.rc == 0){ + // 操作成功，等待弹屏 + } else { + // 操作未成功，进行提示 + top.layer.msg('未能成功发起会话，请稍后再试！',{icon: 2, time: 3000}) + } + }, handleRestApiFail); } } else if(data.status) { handleRestApiFail(data.status, data.data); diff --git a/contact-center/app/src/main/resources/templates/apps/cca/agentusers.html b/contact-center/app/src/main/resources/templates/apps/cca/agentusers.html index 3557b532..9c5a58cb 100644 --- a/contact-center/app/src/main/resources/templates/apps/cca/agentusers.html +++ b/contact-center/app/src/main/resources/templates/apps/cca/agentusers.html @@ -14,13 +14,8 @@ - +