From 95f35c13e0b8fc1537b5f0dffc5d00dfd44ed3cd Mon Sep 17 00:00:00 2001 From: lecjy <565572696@qq.com> Date: Thu, 22 Jun 2023 13:38:51 +0800 Subject: [PATCH] Spring Boot 3 --- contact-center/app/pom.xml | 61 ++++------- .../main/java/com/cskefu/cc/Application.java | 41 ++++--- .../com/cskefu/cc/ServletInitializer.java | 28 ----- .../com/cskefu/cc/acd/ACDAgentService.java | 10 +- .../com/cskefu/cc/acd/ACDChatbotService.java | 2 +- .../com/cskefu/cc/acd/ACDPolicyService.java | 2 +- .../cskefu/cc/acd/ACDVisitorDispatcher.java | 2 +- .../middleware/visitor/ACDVisBindingMw.java | 4 +- .../cc/activemq/AgentAuditSubscription.java | 2 +- .../cskefu/cc/activemq/BrokerPublisher.java | 6 +- .../cc/activemq/OnlineUserSubscription.java | 2 +- .../SocketioConnEventSubscription.java | 2 +- .../java/com/cskefu/cc/basic/MainUtils.java | 10 +- .../com/cskefu/cc/basic/TerminateBean.java | 2 +- .../cskefu/cc/basic/auth/BearerTokenMgr.java | 2 +- .../cskefu/cc/basic/resource/Resource.java | 5 +- .../com/cskefu/cc/cache/RedisCommand.java | 2 +- .../cskefu/cc/config/ActiveMQConfigure.java | 3 +- .../cc/config/ApiRequestMatchingFilter.java | 6 +- .../cc/config/CSKeFuWebAppConfigurer.java | 19 ++-- .../config/DelegateRequestMatchingFilter.java | 6 +- .../cskefu/cc/config/DruidConfiguration.java | 102 ------------------ .../cc/config/MessagingServerConfigure.java | 2 +- .../java/com/cskefu/cc/config/PugConfig.java | 1 - .../cc/config/PugCskefuViewResolver.java | 2 +- .../com/cskefu/cc/config/RedisConfigure.java | 10 +- .../com/cskefu/cc/config/WebConfigBeans.java | 2 +- .../cskefu/cc/config/WebSecurityConfig.java | 48 +++++---- .../config/WebServerContainerConfigure.java | 15 +-- .../cc/config/WebServerSessionConfigure.java | 22 ++-- .../cc/controller/ApplicationController.java | 32 +++--- .../com/cskefu/cc/controller/Handler.java | 4 +- .../cskefu/cc/controller/LoginController.java | 15 +-- .../cc/controller/admin/AdminController.java | 2 +- .../cc/controller/admin/OrganController.java | 28 ++--- .../cc/controller/admin/RoleController.java | 24 ++--- .../cc/controller/admin/UsersController.java | 27 ++--- .../admin/channel/ChannelController.java | 14 +-- .../admin/channel/WebIMController.java | 4 +- .../admin/config/SystemConfigController.java | 4 +- .../admin/config/SystemMessageController.java | 20 ++-- .../admin/system/MetadataController.java | 35 +++--- .../admin/system/SysDicController.java | 32 +++--- .../admin/system/TemplateController.java | 26 ++--- .../api/ApiAgentUserController.java | 12 ++- .../cc/controller/api/ApiAppsController.java | 4 +- .../api/ApiChatMessageController.java | 6 +- .../api/ApiContactNotesController.java | 14 +-- .../api/ApiContactTagsController.java | 6 +- .../controller/api/ApiContactsController.java | 10 +- .../controller/api/ApiLeavemsgController.java | 13 +-- .../api/ApiOnlineUserController.java | 8 +- .../cc/controller/api/ApiOrganController.java | 6 +- .../controller/api/ApiQualityController.java | 14 +-- .../api/ApiServiceQueneController.java | 4 +- .../controller/api/ApiSysDicController.java | 4 +- .../cc/controller/api/ApiTagsController.java | 4 +- .../cc/controller/api/ApiUserController.java | 27 ++--- .../cc/controller/api/ApiWebIMController.java | 4 +- .../api/UkefuApiTagsController.java | 4 +- .../cc/controller/apps/AccountController.java | 30 +++--- .../controller/apps/AgentAuditController.java | 54 +++++----- .../cc/controller/apps/AgentController.java | 101 +++++++++-------- .../apps/AgentSettingsController.java | 20 ++-- .../cc/controller/apps/AppsController.java | 14 +-- .../controller/apps/ContactsController.java | 38 +++---- .../cc/controller/apps/EntIMController.java | 28 ++--- .../cc/controller/apps/IMController.java | 22 ++-- .../cc/controller/apps/MessageController.java | 2 +- .../apps/service/AgentSummaryController.java | 24 ++--- .../apps/service/ChatServiceController.java | 46 ++++---- .../apps/service/CommentController.java | 6 +- .../apps/service/OnlineUserController.java | 18 ++-- .../service/ProcessedSummaryController.java | 24 ++--- .../apps/service/StatsController.java | 6 +- .../auth/ApiAuthBearerController.java | 8 +- .../auth/ApiAuthErrorController.java | 2 +- .../resource/CallAgentResourceController.java | 14 +-- .../resource/ContactsResourceController.java | 6 +- .../resource/CssResourceController.java | 11 +- .../controller/resource/MediaController.java | 12 +-- .../resource/SysDicResourceController.java | 4 +- .../resource/UsersResourceController.java | 6 +- .../interceptor/CrossInterceptorHandler.java | 8 +- .../RequestLogIntercreptorHandler.java | 4 +- .../UserExperiencePlanInterceptorHandler.java | 8 +- .../interceptor/UserInterceptorHandler.java | 10 +- .../interceptor/ViewsInterceptorHandler.java | 8 +- .../java/com/cskefu/cc/model/Account.java | 2 +- .../main/java/com/cskefu/cc/model/Acl.java | 2 +- .../main/java/com/cskefu/cc/model/AdType.java | 2 +- .../java/com/cskefu/cc/model/AgentReport.java | 2 +- .../com/cskefu/cc/model/AgentService.java | 2 +- .../cskefu/cc/model/AgentServiceSatis.java | 2 +- .../cskefu/cc/model/AgentServiceSummary.java | 2 +- .../java/com/cskefu/cc/model/AgentStatus.java | 2 +- .../java/com/cskefu/cc/model/AgentUser.java | 2 +- .../cskefu/cc/model/AgentUserContacts.java | 2 +- .../com/cskefu/cc/model/AgentUserTask.java | 2 +- .../java/com/cskefu/cc/model/AreaType.java | 2 +- .../com/cskefu/cc/model/AttachmentFile.java | 2 +- .../java/com/cskefu/cc/model/BlackEntity.java | 2 +- .../java/com/cskefu/cc/model/CallAgent.java | 2 +- .../com/cskefu/cc/model/CallCenterSkill.java | 2 +- .../java/com/cskefu/cc/model/Channel.java | 2 +- .../java/com/cskefu/cc/model/Chatbot.java | 2 +- .../com/cskefu/cc/model/ColumnProperties.java | 2 +- .../com/cskefu/cc/model/ContactNotes.java | 2 +- .../java/com/cskefu/cc/model/Contacts.java | 2 +- .../com/cskefu/cc/model/CousultInvite.java | 2 +- .../java/com/cskefu/cc/model/CubeLevel.java | 2 +- .../java/com/cskefu/cc/model/CubeMeasure.java | 2 +- .../java/com/cskefu/cc/model/CubeType.java | 2 +- .../cskefu/cc/model/CustomerGroupForm.java | 2 +- .../java/com/cskefu/cc/model/DataDic.java | 2 +- .../java/com/cskefu/cc/model/DataEvent.java | 6 +- .../java/com/cskefu/cc/model/Dimension.java | 2 +- .../java/com/cskefu/cc/model/DrillDown.java | 2 +- .../java/com/cskefu/cc/model/Extension.java | 2 +- .../java/com/cskefu/cc/model/FbMessenger.java | 2 +- .../main/java/com/cskefu/cc/model/FbOTN.java | 2 +- .../java/com/cskefu/cc/model/FbOtnFollow.java | 2 +- .../java/com/cskefu/cc/model/FormFilter.java | 2 +- .../com/cskefu/cc/model/FormFilterItem.java | 2 +- .../java/com/cskefu/cc/model/Generation.java | 2 +- .../java/com/cskefu/cc/model/IMGroup.java | 2 +- .../java/com/cskefu/cc/model/IMGroupUser.java | 2 +- .../java/com/cskefu/cc/model/Instruction.java | 2 +- .../com/cskefu/cc/model/InviteRecord.java | 2 +- .../java/com/cskefu/cc/model/JobDetail.java | 2 +- .../java/com/cskefu/cc/model/LeaveMsg.java | 2 +- .../main/java/com/cskefu/cc/model/Media.java | 2 +- .../com/cskefu/cc/model/MetadataTable.java | 2 +- .../main/java/com/cskefu/cc/model/Organ.java | 2 +- .../java/com/cskefu/cc/model/OrganRole.java | 2 +- .../java/com/cskefu/cc/model/OrganUser.java | 8 +- .../com/cskefu/cc/model/Organization.java | 2 +- .../com/cskefu/cc/model/OrgiSkillRel.java | 2 +- .../cskefu/cc/model/PassportWebIMUser.java | 2 +- .../cc/model/PassportWebIMUserHist.java | 2 +- .../cskefu/cc/model/PassportWechatUser.java | 2 +- .../java/com/cskefu/cc/model/PbxHost.java | 2 +- .../java/com/cskefu/cc/model/Product.java | 2 +- .../com/cskefu/cc/model/PropertiesEvent.java | 2 +- .../java/com/cskefu/cc/model/RecentUser.java | 2 +- .../com/cskefu/cc/model/ReportFilter.java | 2 +- .../java/com/cskefu/cc/model/ReportModel.java | 2 +- .../java/com/cskefu/cc/model/Reporter.java | 2 +- .../java/com/cskefu/cc/model/RequestLog.java | 2 +- .../main/java/com/cskefu/cc/model/Role.java | 2 +- .../java/com/cskefu/cc/model/RoleAuth.java | 2 +- .../java/com/cskefu/cc/model/RouterRules.java | 2 +- .../java/com/cskefu/cc/model/SaleStatus.java | 2 +- .../main/java/com/cskefu/cc/model/Secret.java | 2 +- .../java/com/cskefu/cc/model/ServiceAi.java | 2 +- .../com/cskefu/cc/model/SessionConfig.java | 2 +- .../java/com/cskefu/cc/model/SipTrunk.java | 2 +- .../java/com/cskefu/cc/model/StatusEvent.java | 2 +- .../cskefu/cc/model/StatusEventSatisf.java | 2 +- .../com/cskefu/cc/model/StreamingFile.java | 4 +- .../main/java/com/cskefu/cc/model/SysDic.java | 2 +- .../com/cskefu/cc/model/SystemConfig.java | 2 +- .../com/cskefu/cc/model/SystemMessage.java | 2 +- .../com/cskefu/cc/model/TableProperties.java | 2 +- .../main/java/com/cskefu/cc/model/Tag.java | 2 +- .../java/com/cskefu/cc/model/TagRelation.java | 2 +- .../java/com/cskefu/cc/model/Template.java | 2 +- .../cskefu/cc/model/UKefuCallOutFilter.java | 2 +- .../com/cskefu/cc/model/UKefuCallOutRole.java | 2 +- .../com/cskefu/cc/model/UKefuCallOutTask.java | 2 +- .../main/java/com/cskefu/cc/model/User.java | 2 +- .../java/com/cskefu/cc/model/UserHistory.java | 2 +- .../java/com/cskefu/cc/model/UserRole.java | 2 +- .../com/cskefu/cc/model/UserTraceHistory.java | 2 +- .../java/com/cskefu/cc/model/WorkMonitor.java | 2 +- .../java/com/cskefu/cc/model/WorkSession.java | 2 +- .../java/com/cskefu/cc/peer/PeerSyncIM.java | 2 +- .../com/cskefu/cc/peer/im/ComposeMw1.java | 2 +- .../cc/persistence/blob/JpaBlobHelper.java | 2 +- .../cc/persistence/hibernate/BaseService.java | 25 ++++- .../impl/OrganDataExchangeImpl.java | 2 +- .../impl/ServiceDataExchangeImpl.java | 2 +- .../persistence/impl/TagDataExchangeImpl.java | 2 +- .../impl/UserDataExchangeImpl.java | 2 +- .../repository/AdTypeRepository.java | 2 - .../repository/AgentReportRepository.java | 5 +- .../repository/AgentServiceRepository.java | 7 +- .../repository/AgentStatusRepository.java | 6 +- .../AgentUserContactsRepository.java | 4 +- .../repository/AgentUserRepository.java | 19 ++-- .../repository/AgentUserTaskRepository.java | 4 +- .../repository/AreaTypeRepository.java | 2 - .../repository/AttachmentRepository.java | 2 - .../repository/BlackListRepository.java | 2 - .../repository/CallAgentRepository.java | 2 - .../repository/CallCenterSkillRepository.java | 31 ------ .../repository/ChannelRepository.java | 15 ++- .../repository/ChatMessageRepository.java | 15 ++- .../repository/ChatbotRepository.java | 3 +- .../repository/ConsultInviteRepository.java | 7 +- .../repository/ContactsRepository.java | 4 +- .../repository/DataSourceService.java | 5 +- .../repository/ExtensionRepository.java | 6 +- .../repository/FormFilterRepository.java | 2 - .../repository/IMGroupRepository.java | 4 +- .../repository/IMGroupUserRepository.java | 2 - .../repository/JobDetailRepository.java | 2 - .../repository/LeaveMsgRepository.java | 5 +- .../repository/MetadataRepository.java | 1 - .../repository/OrganRepository.java | 5 +- .../repository/OrganRoleRepository.java | 3 +- .../repository/OrganUserRepository.java | 2 +- .../PassportWebIMUserHistRepository.java | 3 +- .../PassportWebIMUserRepository.java | 6 +- .../repository/PbxHostRepository.java | 3 +- .../repository/ReporterRepository.java | 1 - .../repository/RoleAuthRepository.java | 4 +- .../repository/RoleRepository.java | 4 +- .../repository/SaleStatusRepository.java | 2 - .../repository/ServiceAiRepository.java | 2 - .../repository/ServiceSummaryRepository.java | 2 - .../repository/SessionConfigRepository.java | 2 +- .../repository/SipTrunkRepository.java | 4 +- .../repository/StatusEventRepository.java | 14 ++- .../repository/SysDicRepository.java | 5 +- .../repository/SystemConfigRepository.java | 2 +- .../repository/SystemMessageRepository.java | 4 +- .../repository/TablePropertiesRepository.java | 2 - .../persistence/repository/TagRepository.java | 6 +- .../repository/TemplateRepository.java | 1 - .../UKefuCallOutFilterRepository.java | 2 - .../UKefuCallOutRoleRepository.java | 2 - .../UKefuCallOutTaskRepository.java | 2 - .../repository/UserRepository.java | 5 +- .../repository/UserRoleRepository.java | 2 +- .../repository/WeiXinUserRepository.java | 2 - .../repository/WorkMonitorRepository.java | 2 - .../repository/WorkSessionRepository.java | 4 +- .../plugins/chatbot/ApiChatbotController.java | 14 +-- .../cc/plugins/chatbot/ChatbotComposer.java | 2 +- .../cc/plugins/chatbot/ChatbotController.java | 6 +- .../plugins/chatbot/ChatbotEventHandler.java | 4 +- .../chatbot/ChatbotEventSubscription.java | 2 +- .../chatbot/ChatbotPluginConfigurer.java | 2 +- .../chatbot/ChatbotSocketIOConfigurer.java | 2 +- .../messenger/MessengerChannelController.java | 22 ++-- .../messenger/MessengerChannelMessager.java | 2 + .../plugins/messenger/MessengerChatbot.java | 2 +- .../messenger/MessengerEventSubscription.java | 2 +- .../messenger/MessengerMessageProxy.java | 9 +- .../messenger/MessengerOTNController.java | 14 +-- .../messenger/MessengerPluginConfigurer.java | 2 +- .../java/com/cskefu/cc/proxy/AgentProxy.java | 4 +- .../cskefu/cc/proxy/AgentServiceProxy.java | 16 ++- .../com/cskefu/cc/proxy/AgentUserProxy.java | 20 ++-- .../com/cskefu/cc/proxy/BlackEntityProxy.java | 4 +- .../com/cskefu/cc/proxy/OnlineUserProxy.java | 12 +-- .../java/com/cskefu/cc/proxy/OrganProxy.java | 8 +- .../java/com/cskefu/cc/proxy/UserProxy.java | 15 ++- .../com/cskefu/cc/schedule/WebIMTask.java | 8 +- .../cc/socketio/message/ChatMessage.java | 2 +- .../cskefu/cc/socketio/util/HumanUtils.java | 4 +- .../com/cskefu/cc/util/CallCenterUtils.java | 14 +-- .../cskefu/cc/util/PropertiesEventUtil.java | 2 +- .../cc/util/dsdata/ExcelImportProecess.java | 2 +- .../cc/util/metadata/UKDatabaseMetadata.java | 22 ++-- .../cc/util/metadata/UKTableMetaData.java | 14 +-- .../app/src/main/java/mondrian/olap/Util.java | 5 +- .../main/java/mondrian/olap/fun/FunUtil.java | 9 +- .../main/java/mondrian/rolap/RolapStar.java | 7 +- .../java/mondrian/rolap/SqlStatement.java | 29 +++-- .../src/main/resources/application.properties | 9 +- contact-center/root/pom.xml | 48 +++++---- 273 files changed, 987 insertions(+), 1196 deletions(-) delete mode 100644 contact-center/app/src/main/java/com/cskefu/cc/ServletInitializer.java delete mode 100644 contact-center/app/src/main/java/com/cskefu/cc/config/DruidConfiguration.java delete mode 100644 contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/CallCenterSkillRepository.java diff --git a/contact-center/app/pom.xml b/contact-center/app/pom.xml index 410d3b11..ce162733 100644 --- a/contact-center/app/pom.xml +++ b/contact-center/app/pom.xml @@ -19,21 +19,6 @@ contact-center - - org.springframework.boot - spring-boot-maven-plugin - - - - repackage - - - - - - org.apache.maven.plugins - maven-resources-plugin - pl.project13.maven git-commit-id-plugin @@ -73,28 +58,6 @@ true - - org.springframework.boot - spring-boot-maven-plugin - - true - - - - org.springframework - springloaded - 1.2.8.RELEASE - - - - - maven-compiler-plugin - - 1.8 - 1.8 - UTF-8 - - org.apache.maven.plugins maven-war-plugin @@ -113,13 +76,27 @@ 3.3.2 + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + org.springframework + springloaded + 1.2.8.RELEASE + + + org.apache.maven.plugins - maven-compiler-plugin - - 9 - 9 - + maven-resources-plugin compile diff --git a/contact-center/app/src/main/java/com/cskefu/cc/Application.java b/contact-center/app/src/main/java/com/cskefu/cc/Application.java index 5d560b91..f1293b72 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/Application.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/Application.java @@ -21,6 +21,7 @@ import com.cskefu.cc.basic.MainContext; import com.cskefu.cc.config.AppCtxRefreshEventListener; import com.cskefu.cc.util.SystemEnvHelper; import com.cskefu.cc.util.mobile.MobileNumberUtils; +import jakarta.servlet.MultipartConfigElement; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -28,15 +29,18 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.Banner; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.jms.JmsPoolConnectionFactoryFactory; import org.springframework.boot.builder.SpringApplicationBuilder; -import org.springframework.boot.context.embedded.EmbeddedServletContainerCustomizer; -import org.springframework.boot.web.servlet.ErrorPage; +import org.springframework.boot.web.server.ConfigurableWebServerFactory; +import org.springframework.boot.web.server.ErrorPage; +import org.springframework.boot.web.server.WebServerFactoryCustomizer; import org.springframework.boot.web.servlet.MultipartConfigFactory; import org.springframework.context.annotation.Bean; import org.springframework.data.jpa.repository.config.EnableJpaRepositories; +import org.springframework.http.HttpStatus; import org.springframework.transaction.annotation.EnableTransactionManagement; +import org.springframework.util.unit.DataSize; -import javax.servlet.MultipartConfigElement; import java.io.IOException; @SpringBootApplication @@ -50,10 +54,10 @@ public class Application { private String uploaddir; @Value("${spring.servlet.multipart.max-file-size}") - private String multipartMaxUpload; + private Long multipartMaxUpload; @Value("${spring.servlet.multipart.max-request-size}") - private String multipartMaxRequest; + private Long multipartMaxRequest; /** * 加载模块 @@ -63,7 +67,6 @@ public class Application { if (StringUtils.equalsIgnoreCase(SystemEnvHelper.parseFromApplicationProps("cskefu.modules.contacts"), "true")) { MainContext.enableModule(Constants.CSKEFU_MODULE_CONTACTS); } - // 会话监控模块 Customer Chats Audit if (StringUtils.equalsIgnoreCase(SystemEnvHelper.parseFromApplicationProps("cskefu.modules.cca"), "true")) { MainContext.enableModule(Constants.CSKEFU_MODULE_CCA); @@ -99,7 +102,7 @@ public class Application { app.setBannerMode(Banner.Mode.CONSOLE); app.setAddCommandLineProperties(false); app.addListeners(new AppCtxRefreshEventListener()); - + MainContext.setApplicationContext(app.run(args)); } catch (IOException e) { logger.error("Application Startup Error", e); @@ -107,24 +110,34 @@ public class Application { } } + // TODO lecjy @Bean public MultipartConfigElement multipartConfigElement() { MultipartConfigFactory factory = new MultipartConfigFactory(); - factory.setMaxFileSize(multipartMaxUpload); //KB,MB - factory.setMaxRequestSize(multipartMaxRequest); + factory.setMaxFileSize(DataSize.ofMegabytes(multipartMaxUpload)); //KB,MB + factory.setMaxRequestSize(DataSize.ofMegabytes(multipartMaxRequest)); factory.setLocation(uploaddir); return factory.createMultipartConfig(); } + // TODO lecjy @Bean - public EmbeddedServletContainerCustomizer containerCustomizer() { - return container -> { - ErrorPage error = new ErrorPage("/error.html"); - container.addErrorPages(error); + public WebServerFactoryCustomizer webServerFactoryCustomizer() { + return factory -> { + // 定义404错误页 + HttpStatus notFound = HttpStatus.NOT_FOUND; + // 定义404错误页 + ErrorPage errorPage = new ErrorPage(notFound, "/error.html"); + // 追加错误页，替换springboot默认的错误页 + factory.addErrorPages(errorPage); }; } public static void main(String[] args) { - Application.serve(args); + try { + Application.serve(args); + } catch (Exception e) { + e.printStackTrace(); + } } } diff --git a/contact-center/app/src/main/java/com/cskefu/cc/ServletInitializer.java b/contact-center/app/src/main/java/com/cskefu/cc/ServletInitializer.java deleted file mode 100644 index 9db50c8f..00000000 --- a/contact-center/app/src/main/java/com/cskefu/cc/ServletInitializer.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright (C) 2017 优客服-多渠道客服系统 - * Modifications copyright (C) 2018-2023 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.cskefu.cc; - -import org.springframework.boot.builder.SpringApplicationBuilder; -import org.springframework.boot.web.support.SpringBootServletInitializer; - -public class ServletInitializer extends SpringBootServletInitializer{ - - @Override - protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { - return application.sources(Application.class); - } -} diff --git a/contact-center/app/src/main/java/com/cskefu/cc/acd/ACDAgentService.java b/contact-center/app/src/main/java/com/cskefu/cc/acd/ACDAgentService.java index abb1e289..701603b8 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/acd/ACDAgentService.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/acd/ACDAgentService.java @@ -37,6 +37,7 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; import java.util.Date; @@ -61,6 +62,7 @@ public class ACDAgentService { private ACDPolicyService acdPolicyService; @Autowired + @Lazy private PeerSyncIM peerSyncIM; @Autowired @@ -325,7 +327,7 @@ public class ACDAgentService { */ AgentService service = null; if (StringUtils.isNotBlank(agentUser.getAgentserviceid())) { - service = agentServiceRes.findById(agentUser.getAgentserviceid()); + service = agentServiceRes.getReferenceById(agentUser.getAgentserviceid()); } else if (agentStatus != null) { // 该访客没有和坐席对话，因此没有 AgentService // 当做留言处理，创建一个新的 AgentService @@ -339,7 +341,7 @@ public class ACDAgentService { service.setSessiontimes(System.currentTimeMillis() - service.getServicetime().getTime()); } - final AgentUserTask agentUserTask = agentUserTaskRes.findOne( + final AgentUserTask agentUserTask = agentUserTaskRes.getReferenceById( agentUser.getId()); if (agentUserTask != null) { service.setAgentreplyinterval(agentUserTask.getAgentreplyinterval()); @@ -514,7 +516,7 @@ public class ACDAgentService { AgentService agentService = new AgentService(); if (StringUtils.isNotBlank(agentUser.getAgentserviceid())) { - AgentService existAgentService = agentServiceRes.findById(agentUser.getAgentserviceid()); + AgentService existAgentService = agentServiceRes.getReferenceById(agentUser.getAgentserviceid()); if (existAgentService != null) { agentService = existAgentService; } else { @@ -581,7 +583,7 @@ public class ACDAgentService { agentService.setOwner(agentUser.getOwner()); agentService.setTimes(0); - final User agent = userRes.findOne(agentService.getAgentno()); + final User agent = userRes.getReferenceById(agentService.getAgentno()); agentUser.setAgentname(agent.getUname()); agentUser.setAgentno(agentService.getAgentno()); diff --git a/contact-center/app/src/main/java/com/cskefu/cc/acd/ACDChatbotService.java b/contact-center/app/src/main/java/com/cskefu/cc/acd/ACDChatbotService.java index 3e392971..06552a46 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/acd/ACDChatbotService.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/acd/ACDChatbotService.java @@ -46,7 +46,7 @@ public class ACDChatbotService { AgentService agentService = new AgentService(); //放入缓存的对象 Date now = new Date(); if (StringUtils.isNotBlank(agentUser.getAgentserviceid())) { - agentService = agentServiceRes.findById(agentUser.getAgentserviceid()); + agentService = agentServiceRes.getReferenceById(agentUser.getAgentserviceid()); agentService.setEndtime(now); if (agentService.getServicetime() != null) { agentService.setSessiontimes(System.currentTimeMillis() - agentService.getServicetime().getTime()); diff --git a/contact-center/app/src/main/java/com/cskefu/cc/acd/ACDPolicyService.java b/contact-center/app/src/main/java/com/cskefu/cc/acd/ACDPolicyService.java index b5c3aca1..965cd282 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/acd/ACDPolicyService.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/acd/ACDPolicyService.java @@ -164,7 +164,7 @@ public class ACDPolicyService { } if (agentUser != null && StringUtils.isNotBlank(agentUser.getAgentno())) { - User user = userRes.findById(agentUser.getAgentno()); + User user = userRes.getReferenceById(agentUser.getAgentno()); if (user != null && !user.isSuperadmin()) { // 用户不为空，并且不是超级管理员 // 指定坐席 diff --git a/contact-center/app/src/main/java/com/cskefu/cc/acd/ACDVisitorDispatcher.java b/contact-center/app/src/main/java/com/cskefu/cc/acd/ACDVisitorDispatcher.java index 8bd80ebc..9da5995c 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/acd/ACDVisitorDispatcher.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/acd/ACDVisitorDispatcher.java @@ -25,7 +25,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; /** * 处置访客分配 diff --git a/contact-center/app/src/main/java/com/cskefu/cc/acd/middleware/visitor/ACDVisBindingMw.java b/contact-center/app/src/main/java/com/cskefu/cc/acd/middleware/visitor/ACDVisBindingMw.java index 793039c2..f953e2e2 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/acd/middleware/visitor/ACDVisBindingMw.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/acd/middleware/visitor/ACDVisBindingMw.java @@ -57,7 +57,7 @@ public class ACDVisBindingMw implements Middleware { if (StringUtils.isNotBlank(ctx.getOrganid())) { logger.info("[apply] bind skill {}", ctx.getOrganid()); // 绑定技能组 - Organ organ = organRes.findOne(ctx.getOrganid()); + Organ organ = organRes.getReferenceById(ctx.getOrganid()); if (organ != null) { ctx.getAgentUser().setSkill(organ.getId()); ctx.setOrgan(organ); @@ -73,7 +73,7 @@ public class ACDVisBindingMw implements Middleware { // 绑定坐席有可能是因为前端展示了技能组和坐席 // 也有可能是坐席发送了邀请，该访客接收邀请 ctx.getAgentUser().setAgentno(ctx.getAgentno()); - User agent = userRes.findOne(ctx.getAgentno()); + User agent = userRes.getReferenceById(ctx.getAgentno()); ctx.setAgent(agent); ctx.getAgentUser().setAgentname(agent.getUname()); } else { diff --git a/contact-center/app/src/main/java/com/cskefu/cc/activemq/AgentAuditSubscription.java b/contact-center/app/src/main/java/com/cskefu/cc/activemq/AgentAuditSubscription.java index 833bac61..a5415b52 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/activemq/AgentAuditSubscription.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/activemq/AgentAuditSubscription.java @@ -69,7 +69,7 @@ public class AgentAuditSubscription { // 查找关联的会话监控信息 final AgentUserAudit agentUserAudit = cache.findOneAgentUserAuditById( json.get("agentUserId").getAsString()).orElseGet(() -> { - final AgentUser agentUser = agentUserRes.findOne(json.get("agentUserId").getAsString()); + final AgentUser agentUser = agentUserRes.getReferenceById(json.get("agentUserId").getAsString()); if (agentUser != null) { return agentAuditProxy.updateAgentUserAudits(agentUser); } else { diff --git a/contact-center/app/src/main/java/com/cskefu/cc/activemq/BrokerPublisher.java b/contact-center/app/src/main/java/com/cskefu/cc/activemq/BrokerPublisher.java index 06d8b337..d842c180 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/activemq/BrokerPublisher.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/activemq/BrokerPublisher.java @@ -12,15 +12,18 @@ package com.cskefu.cc.activemq; import com.alibaba.fastjson.JSONObject; +import jakarta.annotation.PostConstruct; import org.apache.activemq.ScheduledMessage; import org.apache.activemq.command.ActiveMQTopic; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.jms.core.JmsMessagingTemplate; import org.springframework.jms.core.JmsTemplate; +import org.springframework.messaging.Message; +import org.springframework.messaging.core.MessagePostProcessor; import org.springframework.stereotype.Component; -import javax.annotation.PostConstruct; import java.util.Map; @Component @@ -36,7 +39,6 @@ public class BrokerPublisher { logger.info("[ActiveMQ Publisher] setup successfully."); } - /** * 时延消息 * diff --git a/contact-center/app/src/main/java/com/cskefu/cc/activemq/OnlineUserSubscription.java b/contact-center/app/src/main/java/com/cskefu/cc/activemq/OnlineUserSubscription.java index e65c8381..697028c3 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/activemq/OnlineUserSubscription.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/activemq/OnlineUserSubscription.java @@ -22,7 +22,7 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.jms.annotation.JmsListener; import org.springframework.stereotype.Component; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; /** * IM OnlineUser diff --git a/contact-center/app/src/main/java/com/cskefu/cc/activemq/SocketioConnEventSubscription.java b/contact-center/app/src/main/java/com/cskefu/cc/activemq/SocketioConnEventSubscription.java index 5727b548..dc90bcb1 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/activemq/SocketioConnEventSubscription.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/activemq/SocketioConnEventSubscription.java @@ -27,7 +27,7 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.jms.annotation.JmsListener; import org.springframework.stereotype.Component; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import java.util.Date; /** diff --git a/contact-center/app/src/main/java/com/cskefu/cc/basic/MainUtils.java b/contact-center/app/src/main/java/com/cskefu/cc/basic/MainUtils.java index d3a532e1..ced4eced 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/basic/MainUtils.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/basic/MainUtils.java @@ -62,8 +62,8 @@ import org.springframework.beans.FatalBeanException; import org.springframework.util.Assert; import org.springframework.util.ClassUtils; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.awt.image.BufferedImage; import java.beans.BeanInfo; import java.beans.Introspector; @@ -891,7 +891,7 @@ public class MainUtils { Template templet = null; if ((templet = MainContext.getCache().findOneSystemById(id)) == null) { TemplateRepository templateRes = MainContext.getContext().getBean(TemplateRepository.class); - templet = templateRes.findById(id); + templet = templateRes.getReferenceById(id); MainContext.getCache().putSystemById(id, templet); } return templet; @@ -1030,7 +1030,7 @@ public class MainUtils { SystemConfig config = MainUtils.getSystemConfig(); if (config != null && config.isEnablemail() && config.getEmailid() != null) { SystemMessage systemMessage = MainContext.getContext().getBean( - SystemMessageRepository.class).findById(config.getEmailid()); + SystemMessageRepository.class).getReferenceById(config.getEmailid()); MailSender sender = new MailSender( systemMessage.getSmtpserver(), systemMessage.getMailfrom(), systemMessage.getSmtpuser(), decryption(systemMessage.getSmtppassword()), systemMessage.getSeclev(), systemMessage.getSslport()); @@ -1234,7 +1234,7 @@ public class MainUtils { SystemConfig config = MainUtils.getSystemConfig(); if (config != null) { SystemMessage systemMessage = MainContext.getContext().getBean( - SystemMessageRepository.class).findById(id); + SystemMessageRepository.class).getReferenceById(id); if (systemMessage == null) { return false; } diff --git a/contact-center/app/src/main/java/com/cskefu/cc/basic/TerminateBean.java b/contact-center/app/src/main/java/com/cskefu/cc/basic/TerminateBean.java index 0ba518af..8e1335b8 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/basic/TerminateBean.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/basic/TerminateBean.java @@ -10,7 +10,7 @@ */ package com.cskefu.cc.basic; -import javax.annotation.PreDestroy; +import jakarta.annotation.PreDestroy; public class TerminateBean { @PreDestroy diff --git a/contact-center/app/src/main/java/com/cskefu/cc/basic/auth/BearerTokenMgr.java b/contact-center/app/src/main/java/com/cskefu/cc/basic/auth/BearerTokenMgr.java index 17865ec9..2cc4bb91 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/basic/auth/BearerTokenMgr.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/basic/auth/BearerTokenMgr.java @@ -27,7 +27,7 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.data.redis.core.ValueOperations; import org.springframework.stereotype.Component; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import java.util.concurrent.TimeUnit; /** diff --git a/contact-center/app/src/main/java/com/cskefu/cc/basic/resource/Resource.java b/contact-center/app/src/main/java/com/cskefu/cc/basic/resource/Resource.java index 55fd9e4f..9e163833 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/basic/resource/Resource.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/basic/resource/Resource.java @@ -20,7 +20,8 @@ import com.cskefu.cc.basic.MainContext; import com.cskefu.cc.model.JobDetail; import java.lang.reflect.InvocationTargetException; -import java.util.logging.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @author jaddy0302 Rivulet Resource.java 2010-3-6 @@ -28,7 +29,7 @@ import java.util.logging.Logger; */ public abstract class Resource { - public static Logger log = Logger.getLogger(Resource.class.getName()) ; + public static Logger log = LoggerFactory.getLogger(Resource.class.getName()) ; public abstract void begin() throws Exception; diff --git a/contact-center/app/src/main/java/com/cskefu/cc/cache/RedisCommand.java b/contact-center/app/src/main/java/com/cskefu/cc/cache/RedisCommand.java index 316026c1..081bb1fb 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/cache/RedisCommand.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/cache/RedisCommand.java @@ -22,7 +22,7 @@ import org.springframework.data.redis.core.*; import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import java.util.*; import java.util.concurrent.TimeUnit; diff --git a/contact-center/app/src/main/java/com/cskefu/cc/config/ActiveMQConfigure.java b/contact-center/app/src/main/java/com/cskefu/cc/config/ActiveMQConfigure.java index 00ab4eeb..aa736372 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/config/ActiveMQConfigure.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/config/ActiveMQConfigure.java @@ -10,14 +10,13 @@ */ package com.cskefu.cc.config; +import jakarta.jms.ConnectionFactory; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.jms.annotation.EnableJms; import org.springframework.jms.config.DefaultJmsListenerContainerFactory; import org.springframework.jms.config.JmsListenerContainerFactory; -import javax.jms.ConnectionFactory; - @EnableJms @Configuration public class ActiveMQConfigure { diff --git a/contact-center/app/src/main/java/com/cskefu/cc/config/ApiRequestMatchingFilter.java b/contact-center/app/src/main/java/com/cskefu/cc/config/ApiRequestMatchingFilter.java index 23917e8a..071150e1 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/config/ApiRequestMatchingFilter.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/config/ApiRequestMatchingFilter.java @@ -24,9 +24,9 @@ import org.slf4j.LoggerFactory; import org.springframework.http.HttpStatus; import org.springframework.security.web.util.matcher.RequestMatcher; -import javax.servlet.*; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.*; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import static com.cskefu.cc.basic.Constants.AUTH_TOKEN_TYPE_BASIC; diff --git a/contact-center/app/src/main/java/com/cskefu/cc/config/CSKeFuWebAppConfigurer.java b/contact-center/app/src/main/java/com/cskefu/cc/config/CSKeFuWebAppConfigurer.java index c599f351..2567dd7a 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/config/CSKeFuWebAppConfigurer.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/config/CSKeFuWebAppConfigurer.java @@ -22,13 +22,10 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.annotation.Configuration; -import org.springframework.web.servlet.config.annotation.CorsRegistry; -import org.springframework.web.servlet.config.annotation.InterceptorRegistry; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; +import org.springframework.web.servlet.config.annotation.*; @Configuration -public class CSKeFuWebAppConfigurer - extends WebMvcConfigurerAdapter { +public class CSKeFuWebAppConfigurer implements WebMvcConfigurer { private final static Logger logger = LoggerFactory.getLogger(CSKeFuWebAppConfigurer.class); private final static String ENABLE_LOG_REQUEST = SystemEnvHelper.parseFromApplicationProps("extras.log.request"); @@ -43,6 +40,17 @@ public class CSKeFuWebAppConfigurer registry.addMapping("/**").allowedOrigins("*"); } + @Override + @SuppressWarnings("deprecation") + public void configurePathMatch(PathMatchConfigurer configurer) { + configurer.setUseSuffixPatternMatch(Boolean.TRUE); + } + + @Override + public void addResourceHandlers(ResourceHandlerRegistry registry) { + registry.addResourceHandler("/**").addResourceLocations("classpath:/static/"); + } + @Override public void addInterceptors(InterceptorRegistry registry) { // 多个拦截器组成一个拦截器链 @@ -60,6 +68,5 @@ public class CSKeFuWebAppConfigurer } registry.addInterceptor(new ViewsInterceptorHandler()).addPathPatterns("/**"); - super.addInterceptors(registry); } } \ No newline at end of file diff --git a/contact-center/app/src/main/java/com/cskefu/cc/config/DelegateRequestMatchingFilter.java b/contact-center/app/src/main/java/com/cskefu/cc/config/DelegateRequestMatchingFilter.java index 8b8586a3..39cc1ee0 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/config/DelegateRequestMatchingFilter.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/config/DelegateRequestMatchingFilter.java @@ -21,9 +21,9 @@ import com.cskefu.cc.model.User; import org.apache.catalina.connector.ClientAbortException; import org.springframework.security.web.util.matcher.RequestMatcher; -import javax.servlet.*; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.*; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; public class DelegateRequestMatchingFilter implements Filter { diff --git a/contact-center/app/src/main/java/com/cskefu/cc/config/DruidConfiguration.java b/contact-center/app/src/main/java/com/cskefu/cc/config/DruidConfiguration.java deleted file mode 100644 index 0762ed91..00000000 --- a/contact-center/app/src/main/java/com/cskefu/cc/config/DruidConfiguration.java +++ /dev/null @@ -1,102 +0,0 @@ -/* - * Copyright (C) 2017 优客服-多渠道客服系统 - * Modifications copyright (C) 2018-2023 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.cskefu.cc.config; - -import com.alibaba.druid.support.http.StatViewServlet; -import com.alibaba.druid.support.http.WebStatFilter; -import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.boot.jdbc.DatabaseDriver; -import org.springframework.boot.web.servlet.FilterRegistrationBean; -import org.springframework.boot.web.servlet.ServletRegistrationBean; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -import javax.sql.DataSource; - -@Configuration -@ConditionalOnClass(com.alibaba.druid.pool.DruidDataSource.class) -@ConditionalOnProperty(name = "spring.datasource.type", havingValue = "com.alibaba.druid.pool.DruidDataSource", matchIfMissing = true) -public class DruidConfiguration { - - @SuppressWarnings("unchecked") - protected T createDataSource(DataSourceProperties properties, - Class type) { - return (T) properties.initializeDataSourceBuilder().type(type).build(); - } - - /** - * @see org.springframework.boot.autoconfigure.jdbc.DataSourceConfiguration.Tomcat 仿写的你可以去了解 - * @param properties 读入的配置 - * @return DruidDataSource - */ - @Bean - @ConfigurationProperties("spring.datasource.druid") - public com.alibaba.druid.pool.DruidDataSource dataSource(DataSourceProperties properties) { - - com.alibaba.druid.pool.DruidDataSource dataSource = createDataSource(properties, com.alibaba.druid.pool.DruidDataSource.class); - - DatabaseDriver databaseDriver = DatabaseDriver.fromJdbcUrl(properties.determineUrl()); - - String validationQuery = databaseDriver.getValidationQuery(); - if (validationQuery != null) { - dataSource.setTestOnBorrow(true); - dataSource.setValidationQuery(validationQuery); - } - - return dataSource; - } - - - /** - * 注册一个StatViewServlet - * @return - */ - @Bean - public ServletRegistrationBean DruidStatViewServle2(){ - //org.springframework.boot.context.embedded.ServletRegistrationBean提供类的进行注册. - ServletRegistrationBean servletRegistrationBean = new ServletRegistrationBean(new StatViewServlet(),"/druid/*"); - //添加初始化参数：initParams - //白名单： -// servletRegistrationBean.addInitParameter("allow","127.0.0.1"); - //IP黑名单 (存在共同时，deny优先于allow) : 如果满足deny的话提示:Sorry, you are not permitted to view this page. -// servletRegistrationBean.addInitParameter("deny","192.168.1.73"); - //登录查看信息的账号密码. - servletRegistrationBean.addInitParameter("loginUsername","admin"); - servletRegistrationBean.addInitParameter("loginPassword","123456"); - //是否能够重置数据. - servletRegistrationBean.addInitParameter("resetEnable","false"); - return servletRegistrationBean; - } - - /** - * 注册一个：filterRegistrationBean - * @return - */ - - @Bean - public FilterRegistrationBean druidStatFilter2(){ - FilterRegistrationBean filterRegistrationBean = new FilterRegistrationBean(new WebStatFilter()); - //添加过滤规则. - filterRegistrationBean.addUrlPatterns("/*"); - //添加不需要忽略的格式信息. - filterRegistrationBean.addInitParameter("exclusions","*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid2/*"); - return filterRegistrationBean; - } -} \ No newline at end of file diff --git a/contact-center/app/src/main/java/com/cskefu/cc/config/MessagingServerConfigure.java b/contact-center/app/src/main/java/com/cskefu/cc/config/MessagingServerConfigure.java index 7b00e2b2..c5fa3f71 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/config/MessagingServerConfigure.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/config/MessagingServerConfigure.java @@ -27,7 +27,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; -import javax.annotation.PreDestroy; +import jakarta.annotation.PreDestroy; import java.io.File; import java.io.FileInputStream; import java.io.IOException; diff --git a/contact-center/app/src/main/java/com/cskefu/cc/config/PugConfig.java b/contact-center/app/src/main/java/com/cskefu/cc/config/PugConfig.java index 4873c045..052eaebf 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/config/PugConfig.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/config/PugConfig.java @@ -30,7 +30,6 @@ public class PugConfig { @Value("${spring.pug4j.template-loader-path}") private String templatePath; - @Bean public SpringTemplateLoader templateLoader() { SpringTemplateLoader templateLoader = new SpringTemplateLoader(); diff --git a/contact-center/app/src/main/java/com/cskefu/cc/config/PugCskefuViewResolver.java b/contact-center/app/src/main/java/com/cskefu/cc/config/PugCskefuViewResolver.java index 543d4922..17a34b73 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/config/PugCskefuViewResolver.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/config/PugCskefuViewResolver.java @@ -10,7 +10,7 @@ public class PugCskefuViewResolver extends PugViewResolver { AbstractUrlBasedView view = super.buildView(viewName); if (viewName.startsWith("/resource/css")) { PugView pugView = (PugView) view; - pugView.setContentType("text/css ; charset=UTF-8"); + pugView.setContentType("text/css; charset=UTF-8"); } return view; } diff --git a/contact-center/app/src/main/java/com/cskefu/cc/config/RedisConfigure.java b/contact-center/app/src/main/java/com/cskefu/cc/config/RedisConfigure.java index 7dffa596..a0cfc635 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/config/RedisConfigure.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/config/RedisConfigure.java @@ -15,10 +15,9 @@ */ package com.cskefu.cc.config; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.data.redis.connection.jedis.JedisConnectionFactory; +import org.springframework.data.redis.connection.RedisConnectionFactory; import org.springframework.data.redis.listener.RedisMessageListenerContainer; import java.util.concurrent.Executors; @@ -26,13 +25,10 @@ import java.util.concurrent.Executors; @Configuration public class RedisConfigure { - @Autowired - JedisConnectionFactory jedisConnectionFactory; - @Bean - RedisMessageListenerContainer redisContainer() { + RedisMessageListenerContainer redisContainer(RedisConnectionFactory redisConnectionFactory) { final RedisMessageListenerContainer container = new RedisMessageListenerContainer(); - container.setConnectionFactory(jedisConnectionFactory); + container.setConnectionFactory(redisConnectionFactory); container.setTaskExecutor(Executors.newFixedThreadPool(100)); return container; } diff --git a/contact-center/app/src/main/java/com/cskefu/cc/config/WebConfigBeans.java b/contact-center/app/src/main/java/com/cskefu/cc/config/WebConfigBeans.java index a8d86439..3f3845ad 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/config/WebConfigBeans.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/config/WebConfigBeans.java @@ -24,7 +24,7 @@ import org.springframework.web.bind.support.ConfigurableWebBindingInitializer; import org.springframework.web.multipart.support.StandardServletMultipartResolver; import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; @Configuration public class WebConfigBeans { diff --git a/contact-center/app/src/main/java/com/cskefu/cc/config/WebSecurityConfig.java b/contact-center/app/src/main/java/com/cskefu/cc/config/WebSecurityConfig.java index 234f6b53..fdd33c8e 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/config/WebSecurityConfig.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/config/WebSecurityConfig.java @@ -16,11 +16,19 @@ */ package com.cskefu.cc.config; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.security.config.Customizer; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; +import org.springframework.security.config.annotation.web.configurers.CsrfConfigurer; +import org.springframework.security.web.SecurityFilterChain; import org.springframework.security.web.authentication.www.BasicAuthenticationFilter; import org.springframework.security.web.csrf.CsrfToken; import org.springframework.security.web.util.matcher.AntPathRequestMatcher; @@ -28,29 +36,24 @@ import org.springframework.security.web.util.matcher.RequestMatcher; import org.springframework.web.filter.OncePerRequestFilter; import org.springframework.web.util.WebUtils; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import java.io.IOException; @Configuration @EnableWebSecurity -public class WebSecurityConfig extends WebSecurityConfigurerAdapter { +public class WebSecurityConfig { - @Override - protected void configure(HttpSecurity http) throws Exception { - http.addFilterAfter(tokenInfoTokenFilterSecurityInterceptor() , BasicAuthenticationFilter.class) - .antMatcher("*/*").authorizeRequests() - .anyRequest().permitAll() - .and().addFilterAfter(csrfHeaderFilter(), BasicAuthenticationFilter.class) - .addFilterAfter(apiTokenFilterSecurityInterceptor(), BasicAuthenticationFilter.class); - } @Bean - public Filter tokenInfoTokenFilterSecurityInterceptor() throws Exception - { + public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { + return http.addFilterAfter(tokenInfoTokenFilterSecurityInterceptor(), BasicAuthenticationFilter.class) + .authorizeHttpRequests(authorize -> authorize.requestMatchers("/**").permitAll()) + .csrf().disable().headers().frameOptions().sameOrigin() +// .addFilterAfter(csrfHeaderFilter(), BasicAuthenticationFilter.class) // TODO lecjy + .and().addFilterAfter(apiTokenFilterSecurityInterceptor(), BasicAuthenticationFilter.class) + .build(); + } + + @Bean + public Filter tokenInfoTokenFilterSecurityInterceptor() throws Exception { RequestMatcher autconfig = new AntPathRequestMatcher("/autoconfig/**"); RequestMatcher configprops = new AntPathRequestMatcher("/configprops/**"); RequestMatcher beans = new AntPathRequestMatcher("/beans/**"); @@ -67,15 +70,14 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter { // RequestMatcher health = new AntPathRequestMatcher("/health/**"); // RequestMatcher metrics = new AntPathRequestMatcher("/metrics/**"); // return new DelegateRequestMatchingFilter(autconfig , configprops , beans , dump , env , health , info , mappings , metrics , trace, druid); - return new DelegateRequestMatchingFilter(autconfig , configprops , beans , dump , env , mappings , trace, druid); + return new DelegateRequestMatchingFilter(autconfig, configprops, beans, dump, env, mappings, trace, druid); } - + @Bean - public Filter apiTokenFilterSecurityInterceptor() throws Exception - { + public Filter apiTokenFilterSecurityInterceptor() throws Exception { return new ApiRequestMatchingFilter(new AntPathRequestMatcher("/api/**")); } - + private Filter csrfHeaderFilter() { return new OncePerRequestFilter() { diff --git a/contact-center/app/src/main/java/com/cskefu/cc/config/WebServerContainerConfigure.java b/contact-center/app/src/main/java/com/cskefu/cc/config/WebServerContainerConfigure.java index 771a2267..100f2b4b 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/config/WebServerContainerConfigure.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/config/WebServerContainerConfigure.java @@ -18,11 +18,10 @@ package com.cskefu.cc.config; import org.apache.catalina.connector.Connector; import org.apache.coyote.http11.Http11NioProtocol; -import org.apache.tomcat.util.http.LegacyCookieProcessor; +import org.apache.tomcat.util.http.Rfc6265CookieProcessor; import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.context.embedded.EmbeddedServletContainerFactory; -import org.springframework.boot.context.embedded.tomcat.TomcatConnectorCustomizer; -import org.springframework.boot.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory; +import org.springframework.boot.web.embedded.tomcat.TomcatConnectorCustomizer; +import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -42,12 +41,13 @@ public class WebServerContainerConfigure { private String path; @Bean - public EmbeddedServletContainerFactory createEmbeddedServletContainerFactory() throws IOException, NoSuchAlgorithmException { - TomcatEmbeddedServletContainerFactory tomcatFactory = new TomcatEmbeddedServletContainerFactory(); + public TomcatServletWebServerFactory createEmbeddedServletContainerFactory() throws IOException, NoSuchAlgorithmException { + TomcatServletWebServerFactory tomcatFactory = new TomcatServletWebServerFactory(); tomcatFactory.addConnectorCustomizers(new CSKeFuTomcatConnectorCustomizer(maxthread, maxconnections)); // Enable cookie value with space // https://stackoverflow.com/questions/38687210/error-with-cookie-value-when-adding-a-new-spring-session - tomcatFactory.addContextCustomizers(context -> context.setCookieProcessor(new LegacyCookieProcessor())); + // TODO lecjy + tomcatFactory.addContextCustomizers(context -> context.setCookieProcessor(new Rfc6265CookieProcessor())); return tomcatFactory; } @@ -60,6 +60,7 @@ public class WebServerContainerConfigure { this.maxconnection = maxconnection; } + @Override public void customize(Connector connector) { Http11NioProtocol protocol = (Http11NioProtocol) connector.getProtocolHandler(); //设置最大连接数 diff --git a/contact-center/app/src/main/java/com/cskefu/cc/config/WebServerSessionConfigure.java b/contact-center/app/src/main/java/com/cskefu/cc/config/WebServerSessionConfigure.java index 3561aff9..ee4f60eb 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/config/WebServerSessionConfigure.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/config/WebServerSessionConfigure.java @@ -25,10 +25,12 @@ import org.springframework.context.annotation.Primary; import org.springframework.data.redis.connection.jedis.JedisConnectionFactory; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.serializer.StringRedisSerializer; -import org.springframework.session.data.redis.RedisFlushMode; -import org.springframework.session.data.redis.RedisOperationsSessionRepository; +import org.springframework.session.FlushMode; +import org.springframework.session.data.redis.RedisSessionRepository; import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession; +import java.time.Duration; + /** * maxInactiveIntervalInSeconds: 设置 Session 失效时间， @@ -39,14 +41,13 @@ import org.springframework.session.data.redis.config.annotation.web.http.EnableR */ @Configuration -@EnableRedisHttpSession() public class WebServerSessionConfigure { /** * spring在多长时间后强制使redis中的session失效,默认是1800.(单位/秒) */ @Value("${server.session-timeout}") - private int maxInactiveIntervalInSeconds; + private long maxInactiveIntervalInSeconds; @Value("${spring.redis.host}") private String host; @@ -68,16 +69,17 @@ public class WebServerSessionConfigure { @Primary @Bean - public RedisOperationsSessionRepository sessionRepository(RedisTemplate sessionRedisTemplate) { - RedisOperationsSessionRepository sessionRepository = new RedisOperationsSessionRepository(sessionRedisTemplate); - sessionRepository.setDefaultMaxInactiveInterval(maxInactiveIntervalInSeconds); - sessionRepository.setRedisFlushMode(RedisFlushMode.IMMEDIATE); + // TODO lecjy + public RedisSessionRepository sessionRepository(RedisTemplate sessionRedisTemplate) { + RedisSessionRepository sessionRepository = new RedisSessionRepository(sessionRedisTemplate); + sessionRepository.setDefaultMaxInactiveInterval(Duration.ofSeconds(maxInactiveIntervalInSeconds)); + sessionRepository.setFlushMode(FlushMode.IMMEDIATE); sessionRepository.setRedisKeyNamespace(RedisKey.CACHE_SESSIONS); return sessionRepository; } @Bean - public RedisTemplate sessionRedisTemplate() { + public RedisTemplate sessionRedisTemplate() { JedisConnectionFactory factory = new JedisConnectionFactory(); factory.setHostName(host); factory.setPort(port); @@ -87,7 +89,7 @@ public class WebServerSessionConfigure { } factory.setTimeout(timeout); factory.afterPropertiesSet(); - RedisTemplate template = new RedisTemplate<>(); + RedisTemplate template = new RedisTemplate<>(); template.setKeySerializer(new StringRedisSerializer()); template.setHashKeySerializer(new StringRedisSerializer()); template.setConnectionFactory(factory); diff --git a/contact-center/app/src/main/java/com/cskefu/cc/controller/ApplicationController.java b/contact-center/app/src/main/java/com/cskefu/cc/controller/ApplicationController.java index 822b153e..1d9ded38 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/controller/ApplicationController.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/controller/ApplicationController.java @@ -22,6 +22,7 @@ import com.cskefu.cc.basic.MainContext; import com.cskefu.cc.basic.MainUtils; import com.cskefu.cc.cache.Cache; import com.cskefu.cc.model.Organ; +import com.cskefu.cc.model.PbxHost; import com.cskefu.cc.model.User; import com.cskefu.cc.persistence.repository.ExtensionRepository; import com.cskefu.cc.persistence.repository.OrganRepository; @@ -37,8 +38,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.servlet.ModelAndView; -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.validation.Valid; import java.security.NoSuchAlgorithmException; import java.util.HashMap; import java.util.List; @@ -117,19 +118,18 @@ public class ApplicationController extends Handler { // 呼叫中心信息 if (MainContext.hasModule(Constants.CSKEFU_MODULE_CALLCENTER) && logined.isCallcenter()) { extensionRes.findByAgentno(logined.getId()).ifPresent(ext -> { - pbxHostRes.findById(ext.getHostid()).ifPresent(pbx -> { - Map webrtcData = new HashMap<>(); - webrtcData.put("callCenterWebrtcIP", pbx.getWebrtcaddress()); - webrtcData.put("callCenterWebRtcPort", pbx.getWebrtcport()); - webrtcData.put("callCenterExtensionNum", ext.getExtension()); - try { - webrtcData.put("callCenterExtensionPassword", MainUtils.decryption(ext.getPassword())); - } catch (NoSuchAlgorithmException e) { - logger.error("[admin]", e); - webrtcData.put("callCenterError", "Invalid data for callcenter agent."); - } - view.addObject("webrtc", webrtcData); - }); + PbxHost one = pbxHostRes.getReferenceById(ext.getHostid()); + Map webrtcData = new HashMap<>(); + webrtcData.put("callCenterWebrtcIP", one.getWebrtcaddress()); + webrtcData.put("callCenterWebRtcPort", one.getWebrtcport()); + webrtcData.put("callCenterExtensionNum", ext.getExtension()); + try { + webrtcData.put("callCenterExtensionPassword", MainUtils.decryption(ext.getPassword())); + } catch (NoSuchAlgorithmException e) { + logger.error("[admin]", e); + webrtcData.put("callCenterError", "Invalid data for callcenter agent."); + } + view.addObject("webrtc", webrtcData); }); } @@ -145,7 +145,7 @@ public class ApplicationController extends Handler { @ResponseBody public String setOrgan(HttpServletRequest request, @Valid String organ) { if (StringUtils.isNotBlank(organ)) { - Organ currentOrgan = organRepository.findById(organ); + Organ currentOrgan = organRepository.getReferenceById(organ); if (currentOrgan != null) { request.getSession(true).setAttribute(Constants.ORGAN_SESSION_NAME, currentOrgan); } diff --git a/contact-center/app/src/main/java/com/cskefu/cc/controller/Handler.java b/contact-center/app/src/main/java/com/cskefu/cc/controller/Handler.java index 751fb175..6c43dd1a 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/controller/Handler.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/controller/Handler.java @@ -39,8 +39,8 @@ import org.springframework.web.bind.annotation.SessionAttributes; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.servlet.ModelAndView; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; import java.io.IOException; import java.io.ByteArrayInputStream; import java.util.ArrayList; diff --git a/contact-center/app/src/main/java/com/cskefu/cc/controller/LoginController.java b/contact-center/app/src/main/java/com/cskefu/cc/controller/LoginController.java index c9737cdc..6dc72069 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/controller/LoginController.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/controller/LoginController.java @@ -46,10 +46,10 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.servlet.ModelAndView; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; import java.io.UnsupportedEncodingException; import java.security.NoSuchAlgorithmException; import java.util.Date; @@ -140,7 +140,7 @@ public class LoginController extends Handler { try { flagid = MainUtils.decryption(cookie.getValue()); if (StringUtils.isNotBlank(flagid)) { - User user = userRepository.findById(flagid); + User user = userRepository.getReferenceById(flagid); if (user != null) { view = this.processLogin(request, user, referer); } @@ -214,10 +214,11 @@ public class LoginController extends Handler { } // add authorization code for rest api - String token = String.format("%s %s", Constants.AUTH_TOKEN_TYPE_BEARER, MainUtils.getUUID()); + String uuid = MainUtils.getUUID(); + String token = String.format("%s %s", Constants.AUTH_TOKEN_TYPE_BEARER, uuid); bearerTokenMgr.update(token, loginUser); userRepository.save(loginUser); // 更新登录状态到数据库 - response.addCookie((new Cookie("authorization", token))); + response.addCookie((new Cookie("authorization", uuid))); // 该登录用户是坐席，并且具有坐席对话的角色 if ((loginUser.isAgent() && diff --git a/contact-center/app/src/main/java/com/cskefu/cc/controller/admin/AdminController.java b/contact-center/app/src/main/java/com/cskefu/cc/controller/admin/AdminController.java index b44081a9..63e1d086 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/controller/admin/AdminController.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/controller/admin/AdminController.java @@ -36,7 +36,7 @@ import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.List; diff --git a/contact-center/app/src/main/java/com/cskefu/cc/controller/admin/OrganController.java b/contact-center/app/src/main/java/com/cskefu/cc/controller/admin/OrganController.java index 7f586047..09ec72f7 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/controller/admin/OrganController.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/controller/admin/OrganController.java @@ -34,8 +34,8 @@ import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.validation.Valid; import java.util.*; /** @@ -143,10 +143,10 @@ public class OrganController extends Handler { public ModelAndView add(ModelMap map, HttpServletRequest request, @Valid String parent, @Valid String area) { map.addAttribute("areaList", areaRepository.findAll()); if (!StringUtils.isBlank(parent)) { - map.addAttribute("organ", organRepository.findById(parent)); + map.addAttribute("organ", organRepository.getReferenceById(parent)); } if (!StringUtils.isBlank(area)) { - map.addAttribute("area", areaRepository.findById(area)); + map.addAttribute("area", areaRepository.getReferenceById(area)); } map.addAttribute("organList", getOwnOragans(request)); @@ -184,7 +184,7 @@ public class OrganController extends Handler { public ModelAndView seluser(ModelMap map, HttpServletRequest request, @Valid String organ) { Map organs = organProxy.findAllOrganByParent(super.getOrgan(request)); map.addAttribute("userList", userProxy.findUserInOrgans(organs.keySet())); - Organ organData = organRepository.findById(organ); + Organ organData = organRepository.getReferenceById(organ); map.addAttribute("userOrganList", userProxy .findByOrganAndDatastatus(organ, false)); map.addAttribute("organ", organData); @@ -210,8 +210,8 @@ public class OrganController extends Handler { if (users != null && users.length > 0) { List chosen = new ArrayList<>(Arrays.asList(users)); - Organ organData = organRepository.findById(organ); - List organUserList = userRepository.findAll(chosen); + Organ organData = organRepository.getReferenceById(organ); + List organUserList = userRepository.findAllById(chosen); for (final User user : organUserList) { OrganUser ou = organUserRes.findByUseridAndOrgan(user.getId(), organ); @@ -254,7 +254,7 @@ public class OrganController extends Handler { } } } - userRepository.save(organUserList); + userRepository.saveAll(organUserList); } return request(super.createView("redirect:/admin/organ/index.html?organ=" + organ)); @@ -285,7 +285,7 @@ public class OrganController extends Handler { ModelAndView view = request(super.createView("/admin/organ/edit")); Organ currentOrgan = super.getOrgan(request); map.addAttribute("areaList", areaRepository.findAll()); - view.addObject("organData", organRepository.findById(id)); + view.addObject("organData", organRepository.getReferenceById(id)); view.addObject("isRootOrgan", id.equals(currentOrgan.getId())); map.addAttribute("organList", getOwnOragans(request)); return view; @@ -310,14 +310,14 @@ public class OrganController extends Handler { } map.addAttribute("cacheList", Dict.getInstance().getDic(Constants.CSKEFU_SYSTEM_AREA_DIC)); - map.addAttribute("organData", organRepository.findById(id)); + map.addAttribute("organData", organRepository.getReferenceById(id)); return request(super.createView("/admin/organ/area")); } @RequestMapping("/area/update") @Menu(type = "admin", subtype = "organ") public ModelAndView areaupdate(HttpServletRequest request, @Valid Organ organ) { - Organ tempOrgan = organRepository.findById(organ.getId()); + Organ tempOrgan = organRepository.getReferenceById(organ.getId()); String msg = "admin_organ_update_success"; if (tempOrgan != null) { tempOrgan.setArea(organ.getArea()); @@ -334,7 +334,7 @@ public class OrganController extends Handler { public ModelAndView delete(HttpServletRequest request, @Valid Organ organ) { String msg = "admin_organ_delete"; - Organ organSelf = organRepository.findById(organ.getId()); + Organ organSelf = organRepository.getReferenceById(organ.getId()); List organParentAre = organRepository.findByParent(organSelf.getId()); if (organ != null && organParentAre != null && organParentAre.size() > 0) { msg = "admin_oran_not_delete"; @@ -353,9 +353,9 @@ public class OrganController extends Handler { @RequestMapping("/auth/save") @Menu(type = "admin", subtype = "role") public ModelAndView authsave(HttpServletRequest request, @Valid String id, @Valid String menus) { - Organ organData = organRepository.findById(id); + Organ organData = organRepository.getReferenceById(id); List organRoleList = organRoleRes.findByOrgan(organData); - organRoleRes.delete(organRoleList); + organRoleRes.deleteAll(organRoleList); if (!StringUtils.isBlank(menus)) { String[] menusarray = menus.split(","); for (String menu : menusarray) { diff --git a/contact-center/app/src/main/java/com/cskefu/cc/controller/admin/RoleController.java b/contact-center/app/src/main/java/com/cskefu/cc/controller/admin/RoleController.java index 3441fd12..06f51501 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/controller/admin/RoleController.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/controller/admin/RoleController.java @@ -38,8 +38,8 @@ import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.validation.Valid; import java.util.Arrays; import java.util.Date; import java.util.List; @@ -96,10 +96,10 @@ public class RoleController extends Handler { // Page userRoleList = // userRoleRes.findByOrganAndRole(currentOrgan.getId(), roleData, - // new PageRequest(super.getP(request), super.getPs(request))); + // PageRequest.of(super.getP(request), super.getPs(request))); Page userRoleList = userRoleRes.findByOrganInAndRole(organs.keySet(), roleData, - new PageRequest(super.getP(request), super.getPs(request))); + PageRequest.of(super.getP(request), super.getPs(request))); if (userRoleList.getContent().size() > 0) { for (UserRole ur : userRoleList.getContent()) { @@ -148,7 +148,7 @@ public class RoleController extends Handler { public ModelAndView seluser(ModelMap map, HttpServletRequest request, @Valid String role) { Organ currentOrgan = super.getOrgan(request); map.addAttribute("userList", userProxy.findUserInOrgans(Arrays.asList(currentOrgan.getId()))); - Role roleData = roleRepository.findById(role); + Role roleData = roleRepository.getReferenceById(role); map.addAttribute("userRoleList", userRoleRes.findByRole(roleData)); map.addAttribute("role", roleData); return request(super.createView("/admin/role/seluser")); @@ -158,7 +158,7 @@ public class RoleController extends Handler { @Menu(type = "admin", subtype = "saveuser", admin = true) public ModelAndView saveuser(HttpServletRequest request, @Valid String[] users, @Valid String role) { Organ currentOrgan = super.getOrgan(request); - Role roleData = roleRepository.findById(role); + Role roleData = roleRepository.getReferenceById(role); List userRoleList = userRoleRes.findByRole(roleData); if (users != null && users.length > 0) { for (String user : users) { @@ -186,7 +186,7 @@ public class RoleController extends Handler { @Menu(type = "admin", subtype = "role") public ModelAndView userroledelete(HttpServletRequest request, @Valid String id, @Valid String role) { if (role != null) { - userRoleRes.delete(id); + userRoleRes.deleteById(id); } return request(super.createView("redirect:/admin/role/index.html?role=" + role)); } @@ -195,7 +195,7 @@ public class RoleController extends Handler { @Menu(type = "admin", subtype = "role") public ModelAndView edit(ModelMap map, HttpServletRequest request, @Valid String id) { ModelAndView view = request(super.createView("/admin/role/edit")); - view.addObject("roleData", roleRepository.findById(id)); + view.addObject("roleData", roleRepository.getReferenceById(id)); return view; } @@ -206,7 +206,7 @@ public class RoleController extends Handler { String msg = ""; if (tempRoleExist == null) { msg = "admin_role_update_success"; - Role tempRole = roleRepository.findById(role.getId()); + Role tempRole = roleRepository.getReferenceById(role.getId()); tempRole.setName(role.getName()); tempRole.setUpdatetime(new Date()); roleRepository.save(tempRole); @@ -221,7 +221,7 @@ public class RoleController extends Handler { public ModelAndView delete(HttpServletRequest request, @Valid Role role) { String msg = "admin_role_delete"; if (role != null) { - userRoleRes.delete(userRoleRes.findByRole(role)); + userRoleRes.deleteAll(userRoleRes.findByRole(role)); roleRepository.delete(role); } else { msg = "admin_role_not_exist"; @@ -238,7 +238,7 @@ public class RoleController extends Handler { map.addAttribute("resourceList", sysDicRes.findByDicid(sysDic.getId())); } map.addAttribute("sysDic", sysDic); - Role role = roleRepository.findById(id); + Role role = roleRepository.getReferenceById(id); map.addAttribute("role", role); map.addAttribute("roleAuthList", roleAuthRes.findByRoleid(role.getId())); return request(super.createView("/admin/role/auth")); @@ -250,7 +250,7 @@ public class RoleController extends Handler { // logger.info("[authsave] id {}, menus {}", id, menus); List roleAuthList = roleAuthRes.findByRoleid(id); - roleAuthRes.delete(roleAuthList); + roleAuthRes.deleteAll(roleAuthList); if (StringUtils.isNotBlank(menus)) { String[] menuarray = menus.split(","); diff --git a/contact-center/app/src/main/java/com/cskefu/cc/controller/admin/UsersController.java b/contact-center/app/src/main/java/com/cskefu/cc/controller/admin/UsersController.java index 611dba24..94a64790 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/controller/admin/UsersController.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/controller/admin/UsersController.java @@ -21,17 +21,13 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.validation.Valid; import com.cskefu.cc.basic.Constants; import com.cskefu.cc.basic.MainContext; import com.cskefu.cc.controller.Handler; -import com.cskefu.cc.model.Organ; -import com.cskefu.cc.model.OrganUser; -import com.cskefu.cc.model.Role; -import com.cskefu.cc.model.User; -import com.cskefu.cc.model.UserRole; +import com.cskefu.cc.model.*; import com.cskefu.cc.persistence.repository.ExtensionRepository; import com.cskefu.cc.persistence.repository.OrganUserRepository; import com.cskefu.cc.persistence.repository.PbxHostRepository; @@ -103,7 +99,7 @@ public class UsersController extends Handler { organs.add(currentOrgan.getId()); map.addAttribute("currentOrgan", currentOrgan); - map.addAttribute("userList", userProxy.findUserInOrgans(organs, new PageRequest( + map.addAttribute("userList", userProxy.findUserInOrgans(organs, PageRequest.of( super.getP(request), super.getPs(request), Sort.Direction.ASC, @@ -130,17 +126,16 @@ public class UsersController extends Handler { @Menu(type = "admin", subtype = "user") public ModelAndView edit(ModelMap map, HttpServletRequest request, @Valid String id) { ModelAndView view = request(super.createView("/admin/user/edit")); - User user = userRepository.findById(id); + User user = userRepository.getReferenceById(id); if (user != null && MainContext.hasModule(Constants.CSKEFU_MODULE_CALLCENTER)) { // 加载呼叫中心信息 extensionRes.findByAgentno(user.getId()).ifPresent(p -> { user.setExtensionId(p.getId()); user.setExtension(p); - pbxHostRes.findById(p.getHostid()).ifPresent(b -> { - user.setPbxhostId(b.getId()); - user.setPbxHost(b); - }); + PbxHost one = pbxHostRes.getReferenceById(p.getHostid()); + user.setPbxhostId(one.getId()); + user.setPbxHost(one); }); } view.addObject("userData", user); @@ -152,16 +147,16 @@ public class UsersController extends Handler { public ModelAndView delete(HttpServletRequest request, @Valid User user) { String msg = "admin_user_delete"; if (user != null) { - User dbUser = userRepository.getOne(user.getId()); + User dbUser = userRepository.getReferenceById(user.getId()); if (dbUser.isSuperadmin()) { msg = "admin_user_abandoned"; } else { // 删除用户的时候，同时删除用户对应的权限数据 List userRole = userRoleRes.findByUser(user); - userRoleRes.delete(userRole); + userRoleRes.deleteAll(userRole); // 删除用户对应的组织机构关系 List organUsers = organUserRes.findByUserid(user.getId()); - organUserRes.delete(organUsers); + organUserRes.deleteAll(organUsers); userRepository.delete(dbUser); diff --git a/contact-center/app/src/main/java/com/cskefu/cc/controller/admin/channel/ChannelController.java b/contact-center/app/src/main/java/com/cskefu/cc/controller/admin/channel/ChannelController.java index d408ad56..dca26413 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/controller/admin/channel/ChannelController.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/controller/admin/channel/ChannelController.java @@ -37,8 +37,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.servlet.ModelAndView; -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.validation.Valid; import java.security.NoSuchAlgorithmException; import java.util.Date; import java.util.List; @@ -74,7 +74,7 @@ public class ChannelController extends Handler { @Menu(type = "admin", subtype = "im", admin = true) public ModelAndView index(ModelMap map, HttpServletRequest request, @Valid String execute, @RequestParam(name = "status", required = false) String status) { Map organs = organProxy.findAllOrganByParent(super.getOrgan(request)); - map.addAttribute("snsAccountList", snsAccountRes.findByTypeAndOrgan(MainContext.ChannelType.WEBIM.toString(), organs.keySet(), new PageRequest(super.getP(request), super.getPs(request)))); + map.addAttribute("snsAccountList", snsAccountRes.findByTypeAndOrgan(MainContext.ChannelType.WEBIM.toString(), organs.keySet(), PageRequest.of(super.getP(request), super.getPs(request)))); map.addAttribute("status", status); List secretConfig = secRes.findAll(); @@ -140,7 +140,7 @@ public class ChannelController extends Handler { public ModelAndView delete(ModelMap map, HttpServletRequest request, @Valid String id, @Valid String confirm) { boolean execute; if (execute = MainUtils.secConfirm(secRes, confirm)) { - Channel channel = snsAccountRes.findById(id); + Channel channel = snsAccountRes.getReferenceById(id); if (snsAccountRes != null) { // 删除网站渠道记录 snsAccountRes.delete(channel); @@ -162,8 +162,8 @@ public class ChannelController extends Handler { @RequestMapping("/edit") @Menu(type = "admin", subtype = "send", admin = true) public ModelAndView edit(ModelMap map, HttpServletRequest request, @Valid String id) { - Channel channel = snsAccountRes.findById(id); - Organ organ = organRes.findOne(channel.getOrgan()); + Channel channel = snsAccountRes.getReferenceById(id); + Organ organ = organRes.getReferenceById(channel.getOrgan()); map.put("organ", organ); map.addAttribute("channel", channel); return request(super.createView("/admin/channel/im/edit")); @@ -172,7 +172,7 @@ public class ChannelController extends Handler { @RequestMapping("/update") @Menu(type = "admin", subtype = "send", admin = true) public ModelAndView update(HttpServletRequest request, @Valid Channel channel) throws NoSuchAlgorithmException { - Channel oldChannel = snsAccountRes.findById(channel.getId()); + Channel oldChannel = snsAccountRes.getReferenceById(channel.getId()); if (oldChannel != null) { oldChannel.setName(channel.getName()); oldChannel.setBaseURL(channel.getBaseURL()); diff --git a/contact-center/app/src/main/java/com/cskefu/cc/controller/admin/channel/WebIMController.java b/contact-center/app/src/main/java/com/cskefu/cc/controller/admin/channel/WebIMController.java index cffcfae1..480e20aa 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/controller/admin/channel/WebIMController.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/controller/admin/channel/WebIMController.java @@ -37,8 +37,8 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.servlet.ModelAndView; -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.validation.Valid; import java.io.IOException; import java.util.ArrayList; import java.util.List; diff --git a/contact-center/app/src/main/java/com/cskefu/cc/controller/admin/config/SystemConfigController.java b/contact-center/app/src/main/java/com/cskefu/cc/controller/admin/config/SystemConfigController.java index 1c2fee5f..f5546bad 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/controller/admin/config/SystemConfigController.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/controller/admin/config/SystemConfigController.java @@ -44,8 +44,8 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.servlet.ModelAndView; -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.validation.Valid; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; diff --git a/contact-center/app/src/main/java/com/cskefu/cc/controller/admin/config/SystemMessageController.java b/contact-center/app/src/main/java/com/cskefu/cc/controller/admin/config/SystemMessageController.java index 27bed8d7..65a530e8 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/controller/admin/config/SystemMessageController.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/controller/admin/config/SystemMessageController.java @@ -34,8 +34,8 @@ import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.validation.Valid; import java.io.IOException; import java.security.NoSuchAlgorithmException; import java.util.List; @@ -53,7 +53,7 @@ public class SystemMessageController extends Handler { @RequestMapping("/email/index") @Menu(type = "setting", subtype = "email") public ModelAndView index(ModelMap map, HttpServletRequest request) throws IOException { - Page emails = systemMessageRepository.findByMsgtype("email", new PageRequest(super.getP(request), super.getPs(request))); + Page emails = systemMessageRepository.findByMsgtype("email", PageRequest.of(super.getP(request), super.getPs(request))); List organs = organRes.findAll(); emails.getContent().stream().forEach(p -> { @@ -86,14 +86,14 @@ public class SystemMessageController extends Handler { @Menu(type = "admin", subtype = "email") public ModelAndView edit(ModelMap map, HttpServletRequest request, @Valid String id) { map.put("organList", organRes.findAll()); - map.addAttribute("email", systemMessageRepository.findById(id)); + map.addAttribute("email", systemMessageRepository.getReferenceById(id)); return request(super.createView("/admin/email/edit")); } @RequestMapping("/email/update") @Menu(type = "admin", subtype = "user", admin = true) public ModelAndView update(HttpServletRequest request, @Valid SystemMessage email) throws NoSuchAlgorithmException { - SystemMessage temp = systemMessageRepository.findById(email.getId()); + SystemMessage temp = systemMessageRepository.getReferenceById(email.getId()); if (email != null) { email.setCreatetime(temp.getCreatetime()); email.setMsgtype(MainContext.SystemMessageType.EMAIL.toString()); @@ -110,7 +110,7 @@ public class SystemMessageController extends Handler { @RequestMapping("/email/delete") @Menu(type = "admin", subtype = "user") public ModelAndView delete(HttpServletRequest request, @Valid SystemMessage email) { - SystemMessage temp = systemMessageRepository.findById(email.getId()); + SystemMessage temp = systemMessageRepository.getReferenceById(email.getId()); if (email != null) { systemMessageRepository.delete(temp); } @@ -121,7 +121,7 @@ public class SystemMessageController extends Handler { @RequestMapping("/sms/index") @Menu(type = "setting", subtype = "sms") public ModelAndView smsindex(ModelMap map, HttpServletRequest request) throws IOException { - map.addAttribute("smsList", systemMessageRepository.findByMsgtype("sms", new PageRequest(super.getP(request), super.getPs(request)))); + map.addAttribute("smsList", systemMessageRepository.findByMsgtype("sms", PageRequest.of(super.getP(request), super.getPs(request)))); return request(super.createView("/admin/sms/index")); } @@ -147,14 +147,14 @@ public class SystemMessageController extends Handler { @Menu(type = "admin", subtype = "sms") public ModelAndView smsedit(ModelMap map, HttpServletRequest request, @Valid String id) { map.addAttribute("smsType", Dict.getInstance().getDic("com.dic.sms.type")); - map.addAttribute("sms", systemMessageRepository.findById(id)); + map.addAttribute("sms", systemMessageRepository.getReferenceById(id)); return request(super.createView("/admin/sms/edit")); } @RequestMapping("/sms/update") @Menu(type = "admin", subtype = "sms", admin = true) public ModelAndView smsupdate(HttpServletRequest request, @Valid SystemMessage sms) throws NoSuchAlgorithmException { - SystemMessage temp = systemMessageRepository.findById(sms.getId()); + SystemMessage temp = systemMessageRepository.getReferenceById(sms.getId()); if (sms != null) { sms.setCreatetime(temp.getCreatetime()); sms.setMsgtype(MainContext.SystemMessageType.SMS.toString()); @@ -171,7 +171,7 @@ public class SystemMessageController extends Handler { @RequestMapping("/sms/delete") @Menu(type = "admin", subtype = "sms") public ModelAndView smsdelete(HttpServletRequest request, @Valid SystemMessage sms) { - SystemMessage temp = systemMessageRepository.findById(sms.getId()); + SystemMessage temp = systemMessageRepository.getReferenceById(sms.getId()); if (sms != null) { systemMessageRepository.delete(temp); } diff --git a/contact-center/app/src/main/java/com/cskefu/cc/controller/admin/system/MetadataController.java b/contact-center/app/src/main/java/com/cskefu/cc/controller/admin/system/MetadataController.java index 21ca130c..db5259f0 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/controller/admin/system/MetadataController.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/controller/admin/system/MetadataController.java @@ -29,7 +29,6 @@ import com.cskefu.cc.util.metadata.UKColumnMetadata; import com.cskefu.cc.util.metadata.UKTableMetaData; import org.apache.commons.lang3.StringUtils; import org.hibernate.Session; -import org.hibernate.jdbc.Work; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.BeansException; @@ -40,10 +39,10 @@ import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.validation.Valid; import java.sql.Connection; import java.sql.SQLException; import java.util.ArrayList; @@ -75,21 +74,21 @@ public class MetadataController extends Handler { @RequestMapping("/index") @Menu(type = "admin", subtype = "metadata", admin = true) public ModelAndView index(ModelMap map, HttpServletRequest request) throws SQLException { - map.addAttribute("metadataList", metadataRes.findAll(new PageRequest(super.getP(request), super.getPs(request)))); + map.addAttribute("metadataList", metadataRes.findAll(PageRequest.of(super.getP(request), super.getPs(request)))); return request(super.createView("/admin/system/metadata/index")); } @RequestMapping("/edit") @Menu(type = "admin", subtype = "metadata", admin = true) public ModelAndView edit(ModelMap map, HttpServletRequest request, @Valid String id) { - map.addAttribute("metadata", metadataRes.findById(id)); + map.addAttribute("metadata", metadataRes.getReferenceById(id)); return request(super.createView("/admin/system/metadata/edit")); } @RequestMapping("/update") @Menu(type = "admin", subtype = "metadata", admin = true) public ModelAndView update(ModelMap map, HttpServletRequest request, @Valid MetadataTable metadata) throws SQLException { - MetadataTable table = metadataRes.findById(metadata.getId()); + MetadataTable table = metadataRes.getReferenceById(metadata.getId()); table.setName(metadata.getName()); table.setFromdb(metadata.isFromdb()); table.setListblocktemplet(metadata.getListblocktemplet()); @@ -101,7 +100,7 @@ public class MetadataController extends Handler { @RequestMapping("/properties/edit") @Menu(type = "admin", subtype = "metadata", admin = true) public ModelAndView propertiesedit(ModelMap map, HttpServletRequest request, @Valid String id) { - map.addAttribute("tp", tablePropertiesRes.findById(id)); + map.addAttribute("tp", tablePropertiesRes.getReferenceById(id)); map.addAttribute("sysdicList", sysDicRes.findByParentid("0")); map.addAttribute("dataImplList", Dict.getInstance().getDic("com.dic.data.impl")); @@ -111,7 +110,7 @@ public class MetadataController extends Handler { @RequestMapping("/properties/update") @Menu(type = "admin", subtype = "metadata", admin = true) public ModelAndView propertiesupdate(ModelMap map, HttpServletRequest request, @Valid TableProperties tp) throws SQLException { - TableProperties tableProperties = tablePropertiesRes.findById(tp.getId()); + TableProperties tableProperties = tablePropertiesRes.getReferenceById(tp.getId()); tableProperties.setName(tp.getName()); tableProperties.setSeldata(tp.isSeldata()); tableProperties.setSeldatacode(tp.getSeldatacode()); @@ -136,7 +135,7 @@ public class MetadataController extends Handler { @RequestMapping("/delete") @Menu(type = "admin", subtype = "metadata", admin = true) public ModelAndView delete(ModelMap map, HttpServletRequest request, @Valid String id) throws SQLException { - MetadataTable table = metadataRes.findById(id); + MetadataTable table = metadataRes.getReferenceById(id); metadataRes.delete(table); return request(super.createView("redirect:/admin/metadata/index.html")); } @@ -145,7 +144,7 @@ public class MetadataController extends Handler { @Menu(type = "admin", subtype = "metadata", admin = true) public ModelAndView batdelete(ModelMap map, HttpServletRequest request, @Valid String[] ids) throws SQLException { if (ids != null && ids.length > 0) { - metadataRes.delete(metadataRes.findAll(Arrays.asList(ids))); + metadataRes.deleteAll(metadataRes.findAllById(Arrays.asList(ids))); } return request(super.createView("redirect:/admin/metadata/index.html")); } @@ -153,7 +152,7 @@ public class MetadataController extends Handler { @RequestMapping("/properties/delete") @Menu(type = "admin", subtype = "metadata", admin = true) public ModelAndView propertiesdelete(ModelMap map, HttpServletRequest request, @Valid String id, @Valid String tbid) throws SQLException { - TableProperties prop = tablePropertiesRes.findById(id); + TableProperties prop = tablePropertiesRes.getReferenceById(id); tablePropertiesRes.delete(prop); return request(super.createView("redirect:/admin/metadata/table.html?id=" + (!StringUtils.isBlank(tbid) ? tbid : prop.getDbtableid()))); } @@ -162,7 +161,7 @@ public class MetadataController extends Handler { @Menu(type = "admin", subtype = "metadata", admin = true) public ModelAndView propertiesbatdelete(ModelMap map, HttpServletRequest request, @Valid String[] ids, @Valid String tbid) throws SQLException { if (ids != null && ids.length > 0) { - tablePropertiesRes.delete(tablePropertiesRes.findAll(Arrays.asList(ids))); + tablePropertiesRes.deleteAll(tablePropertiesRes.findAllById(Arrays.asList(ids))); } return request(super.createView("redirect:/admin/metadata/table.html?id=" + tbid)); } @@ -172,7 +171,7 @@ public class MetadataController extends Handler { public ModelAndView table(ModelMap map, HttpServletRequest request, @Valid String id) throws SQLException { map.addAttribute("propertiesList", tablePropertiesRes.findByDbtableid(id)); map.addAttribute("tbid", id); - map.addAttribute("table", metadataRes.findById(id)); + map.addAttribute("table", metadataRes.getReferenceById(id)); return request(super.createView("/admin/system/metadata/table")); } @@ -270,7 +269,7 @@ public class MetadataController extends Handler { @Menu(type = "admin", subtype = "metadata", admin = true) public ModelAndView clean(ModelMap map, HttpServletRequest request, @Valid String id) throws SQLException, BeansException, ClassNotFoundException { if (!StringUtils.isBlank(id)) { - MetadataTable table = metadataRes.findById(id); + MetadataTable table = metadataRes.getReferenceById(id); } return request(super.createView("redirect:/admin/metadata/index.html")); } @@ -280,7 +279,7 @@ public class MetadataController extends Handler { @Menu(type = "admin", subtype = "metadata", admin = true) public ModelAndView synctoes(ModelMap map, HttpServletRequest request, @Valid String id) throws SQLException, BeansException, ClassNotFoundException { if (!StringUtils.isBlank(id)) { - MetadataTable table = metadataRes.findById(id); + MetadataTable table = metadataRes.getReferenceById(id); if (table.isFromdb() && !StringUtils.isBlank(table.getListblocktemplet())) { SysDic dic = Dict.getInstance().getDicItem(table.getListblocktemplet()); } @@ -293,7 +292,7 @@ public class MetadataController extends Handler { @Menu(type = "admin", subtype = "metadata", admin = true) public ModelAndView synctodb(ModelMap map, HttpServletRequest request, @Valid String id) throws SQLException, BeansException, ClassNotFoundException { if (!StringUtils.isBlank(id)) { - MetadataTable table = metadataRes.findById(id); + MetadataTable table = metadataRes.getReferenceById(id); if (table.isFromdb() && !StringUtils.isBlank(table.getListblocktemplet())) { SysDic dic = Dict.getInstance().getDicItem(table.getListblocktemplet()); } diff --git a/contact-center/app/src/main/java/com/cskefu/cc/controller/admin/system/SysDicController.java b/contact-center/app/src/main/java/com/cskefu/cc/controller/admin/system/SysDicController.java index 7567f47d..01c9cefb 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/controller/admin/system/SysDicController.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/controller/admin/system/SysDicController.java @@ -30,8 +30,8 @@ import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.validation.Valid; import java.util.Date; import java.util.List; @@ -49,7 +49,7 @@ public class SysDicController extends Handler { @RequestMapping("/index") @Menu(type = "admin", subtype = "sysdic") public ModelAndView index(ModelMap map, HttpServletRequest request) { - map.addAttribute("sysDicList", sysDicRes.findByParentid("0", new PageRequest(super.getP(request), super.getPs(request), Direction.DESC, "createtime"))); + map.addAttribute("sysDicList", sysDicRes.findByParentid("0", PageRequest.of(super.getP(request), super.getPs(request), Direction.DESC, "createtime"))); return request(super.createView("/admin/system/sysdic/index")); } @@ -80,7 +80,7 @@ public class SysDicController extends Handler { @RequestMapping("/edit") @Menu(type = "admin", subtype = "sysdic") public ModelAndView edit(ModelMap map, HttpServletRequest request, @Valid String id, @Valid String p) { - map.addAttribute("sysDic", sysDicRes.findById(id)); + map.addAttribute("sysDic", sysDicRes.getReferenceById(id)); map.addAttribute("p", p); return request(super.createView("/admin/system/sysdic/edit")); } @@ -90,7 +90,7 @@ public class SysDicController extends Handler { public ModelAndView update(HttpServletRequest request, @Valid SysDic dic, @Valid String p) { List sysDicList = sysDicRes.findByCodeOrName(dic.getCode(), dic.getName()); if (sysDicList.size() == 0 || (sysDicList.size() == 1 && sysDicList.get(0).getId().equals(dic.getId()))) { - SysDic sysDic = sysDicRes.findById(dic.getId()); + SysDic sysDic = sysDicRes.getReferenceById(dic.getId()); sysDic.setName(dic.getName()); sysDic.setCode(dic.getCode()); sysDic.setCtype(dic.getCtype()); @@ -106,8 +106,8 @@ public class SysDicController extends Handler { @RequestMapping("/delete") @Menu(type = "admin", subtype = "sysdic") public ModelAndView delete(ModelMap map, HttpServletRequest request, @Valid String id, @Valid String p) { - SysDic sysDic = sysDicRes.findById(id); - sysDicRes.delete(sysDicRes.findByDicid(id)); + SysDic sysDic = sysDicRes.getReferenceById(id); + sysDicRes.deleteAll(sysDicRes.findByDicid(id)); sysDicRes.delete(sysDic); reloadSysDicItem(sysDic); @@ -118,15 +118,15 @@ public class SysDicController extends Handler { @RequestMapping("/dicitem") @Menu(type = "admin", subtype = "sysdic") public ModelAndView dicitem(ModelMap map, HttpServletRequest request, @Valid String id) { - map.addAttribute("sysDic", sysDicRes.findById(id)); - map.addAttribute("sysDicList", sysDicRes.findByParentid(id, new PageRequest(super.getP(request), super.getPs(request), Direction.DESC, "createtime"))); + map.addAttribute("sysDic", sysDicRes.getReferenceById(id)); + map.addAttribute("sysDicList", sysDicRes.findByParentid(id, PageRequest.of(super.getP(request), super.getPs(request), Direction.DESC, "createtime"))); return request(super.createView("/admin/system/sysdic/dicitem")); } @RequestMapping("/dicitem/add") @Menu(type = "admin", subtype = "sysdic") public ModelAndView dicitemadd(ModelMap map, HttpServletRequest request, @Valid String id, @Valid String p) { - map.addAttribute("sysDic", sysDicRes.findById(id)); + map.addAttribute("sysDic", sysDicRes.getReferenceById(id)); map.addAttribute("p", p); return request(super.createView("/admin/system/sysdic/dicitemadd")); } @@ -172,7 +172,7 @@ public class SysDicController extends Handler { @RequestMapping("/dicitem/batadd") @Menu(type = "admin", subtype = "sysdic") public ModelAndView dicitembatadd(ModelMap map, HttpServletRequest request, @Valid String id, @Valid String p) { - map.addAttribute("sysDic", sysDicRes.findById(id)); + map.addAttribute("sysDic", sysDicRes.getReferenceById(id)); map.addAttribute("p", p); return request(super.createView("/admin/system/sysdic/batadd")); } @@ -200,7 +200,7 @@ public class SysDicController extends Handler { } } - reloadSysDicItem(sysDicRes.getOne(sysDic.getParentid())); + reloadSysDicItem(sysDicRes.getReferenceById(sysDic.getParentid())); return request(super.createView("redirect:/admin/sysdic/dicitem.html?id=" + sysDic.getParentid() + "&p=" + p)); } @@ -208,7 +208,7 @@ public class SysDicController extends Handler { @RequestMapping("/dicitem/edit") @Menu(type = "admin", subtype = "sysdic") public ModelAndView dicitemedit(ModelMap map, HttpServletRequest request, @Valid String id, @Valid String p) { - map.addAttribute("sysDic", sysDicRes.findById(id)); + map.addAttribute("sysDic", sysDicRes.getReferenceById(id)); map.addAttribute("p", p); return request(super.createView("/admin/system/sysdic/dicitemedit")); } @@ -218,7 +218,7 @@ public class SysDicController extends Handler { public ModelAndView dicitemupdate(HttpServletRequest request, @Valid SysDic dic, @Valid String p) { List sysDicList = sysDicRes.findByDicidAndName(dic.getDicid(), dic.getName()); if (sysDicList.size() == 0 || (sysDicList.size() == 1 && sysDicList.get(0).getId().equals(dic.getId()))) { - SysDic sysDic = sysDicRes.findById(dic.getId()); + SysDic sysDic = sysDicRes.getReferenceById(dic.getId()); sysDic.setName(dic.getName()); sysDic.setCode(dic.getCode()); sysDic.setCtype(dic.getCtype()); @@ -236,8 +236,8 @@ public class SysDicController extends Handler { @RequestMapping("/dicitem/delete") @Menu(type = "admin", subtype = "sysdic") public ModelAndView dicitemdelete(ModelMap map, HttpServletRequest request, @Valid String id, @Valid String p) { - sysDicRes.delete(sysDicRes.findByDicid(id)); - SysDic dic = sysDicRes.getOne(id); + sysDicRes.deleteAll(sysDicRes.findByDicid(id)); + SysDic dic = sysDicRes.getReferenceById(id); sysDicRes.delete(dic); reloadSysDicItem(dic); return request(super.createView("redirect:/admin/sysdic/dicitem.html?id=" + dic.getParentid() + "&p=" + p)); diff --git a/contact-center/app/src/main/java/com/cskefu/cc/controller/admin/system/TemplateController.java b/contact-center/app/src/main/java/com/cskefu/cc/controller/admin/system/TemplateController.java index 505af4cf..276e928b 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/controller/admin/system/TemplateController.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/controller/admin/system/TemplateController.java @@ -35,9 +35,9 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.servlet.ModelAndView; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; @@ -97,7 +97,7 @@ public class TemplateController extends Handler { @RequestMapping("/list") @Menu(type = "admin", subtype = "template", admin = true) public ModelAndView list(ModelMap map, HttpServletRequest request, @Valid String type) { - map.addAttribute("sysDic", dicRes.findById(type)); + map.addAttribute("sysDic", dicRes.getReferenceById(type)); map.addAttribute("templateList", templateRes.findByTemplettype(type)); return request(super.createView("/admin/system/template/list")); } @@ -105,7 +105,7 @@ public class TemplateController extends Handler { @RequestMapping("/add") @Menu(type = "admin", subtype = "template", admin = true) public ModelAndView add(ModelMap map, HttpServletRequest request, @Valid String type) { - map.addAttribute("sysDic", dicRes.findById(type)); + map.addAttribute("sysDic", dicRes.getReferenceById(type)); return request(super.createView("/admin/system/template/add")); } @@ -114,7 +114,7 @@ public class TemplateController extends Handler { public ModelAndView save(HttpServletRequest request, @Valid Template template) { template.setCreatetime(new Date()); - SysDic dic = dicRes.findById(template.getTemplettype()); + SysDic dic = dicRes.getReferenceById(template.getTemplettype()); if (dic != null && StringUtils.isBlank(template.getCode())) { template.setCode(dic.getCode()); } @@ -126,17 +126,17 @@ public class TemplateController extends Handler { @RequestMapping("/edit") @Menu(type = "admin", subtype = "template", admin = true) public ModelAndView edit(ModelMap map, HttpServletRequest request, @Valid String id, @Valid String type) { - map.addAttribute("sysDic", dicRes.findById(type)); - map.addAttribute("template", templateRes.findById(id)); + map.addAttribute("sysDic", dicRes.getReferenceById(type)); + map.addAttribute("template", templateRes.getReferenceById(id)); return request(super.createView("/admin/system/template/edit")); } @RequestMapping("/update") @Menu(type = "admin", subtype = "template", admin = true) public ModelAndView update(HttpServletRequest request, @Valid Template template) { - Template oldTemplate = templateRes.findById(template.getId()); + Template oldTemplate = templateRes.getReferenceById(template.getId()); if (oldTemplate != null) { - SysDic dic = dicRes.findById(oldTemplate.getTemplettype()); + SysDic dic = dicRes.getReferenceById(oldTemplate.getTemplettype()); if (dic != null) { oldTemplate.setCode(dic.getCode()); } @@ -158,15 +158,15 @@ public class TemplateController extends Handler { @RequestMapping("/code") @Menu(type = "admin", subtype = "template", admin = true) public ModelAndView code(ModelMap map, HttpServletRequest request, @Valid String id, @Valid String type) { - map.addAttribute("sysDic", dicRes.findById(type)); - map.addAttribute("template", templateRes.findById(id)); + map.addAttribute("sysDic", dicRes.getReferenceById(type)); + map.addAttribute("template", templateRes.getReferenceById(id)); return request(super.createView("/admin/system/template/code")); } @RequestMapping("/codesave") @Menu(type = "admin", subtype = "template", admin = true) public ModelAndView codesave(HttpServletRequest request, @Valid Template template) { - Template oldTemplate = templateRes.findById(template.getId()); + Template oldTemplate = templateRes.getReferenceById(template.getId()); if (oldTemplate != null) { oldTemplate.setTemplettext(template.getTemplettext()); oldTemplate.setTemplettitle(template.getTemplettitle()); diff --git a/contact-center/app/src/main/java/com/cskefu/cc/controller/api/ApiAgentUserController.java b/contact-center/app/src/main/java/com/cskefu/cc/controller/api/ApiAgentUserController.java index 06e64143..364a315b 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/controller/api/ApiAgentUserController.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/controller/api/ApiAgentUserController.java @@ -41,6 +41,7 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -49,8 +50,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.validation.Valid; import java.util.Date; import java.util.List; @@ -76,6 +77,7 @@ public class ApiAgentUserController extends Handler { private Cache cache; @Autowired + @Lazy private PeerSyncIM peerSyncIM; @Autowired @@ -158,8 +160,8 @@ public class ApiAgentUserController extends Handler { if (StringUtils.isNotBlank(agentUserId) && StringUtils.isNotBlank(transAgentId) && StringUtils.isNotBlank(agentServiceId)) { - final User targetAgent = userRes.findOne(transAgentId); - final AgentService agentService = agentServiceRes.findById(agentServiceId); + final User targetAgent = userRes.getReferenceById(transAgentId); + final AgentService agentService = agentServiceRes.getReferenceById(agentServiceId); /** * 更新AgentUser @@ -295,7 +297,7 @@ public class ApiAgentUserController extends Handler { final User logined = super.getUser(request); JsonObject resp = new JsonObject(); - final AgentUser agentUser = agentUserRes.findById(payload.get("id").getAsString()); + final AgentUser agentUser = agentUserRes.getReferenceById(payload.get("id").getAsString()); if (agentUser != null) { if ((StringUtils.equals( logined.getId(), agentUser.getAgentno()) || logined.isAdmin())) { diff --git a/contact-center/app/src/main/java/com/cskefu/cc/controller/api/ApiAppsController.java b/contact-center/app/src/main/java/com/cskefu/cc/controller/api/ApiAppsController.java index 9a9d6160..2dc1b20d 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/controller/api/ApiAppsController.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/controller/api/ApiAppsController.java @@ -33,8 +33,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.validation.Valid; @RestController @RequestMapping("/api/apps") diff --git a/contact-center/app/src/main/java/com/cskefu/cc/controller/api/ApiChatMessageController.java b/contact-center/app/src/main/java/com/cskefu/cc/controller/api/ApiChatMessageController.java index ad780e3b..69afd8d1 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/controller/api/ApiChatMessageController.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/controller/api/ApiChatMessageController.java @@ -31,8 +31,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.validation.Valid; /** * 获取对话内容 @@ -57,7 +57,7 @@ public class ApiChatMessageController extends Handler { public ResponseEntity list(HttpServletRequest request, @Valid String serviceid) { ResponseEntity result = null; if (!StringUtils.isBlank(serviceid)) { - result = new ResponseEntity<>(new RestResult(RestResultType.OK, chatMessageRes.findByAgentserviceid(serviceid, new PageRequest(super.getP(request), super.getPs(request), Sort.Direction.DESC, "createtime"))), HttpStatus.OK); + result = new ResponseEntity<>(new RestResult(RestResultType.OK, chatMessageRes.findByAgentserviceid(serviceid, PageRequest.of(super.getP(request), super.getPs(request), Sort.Direction.DESC, "createtime"))), HttpStatus.OK); } else { result = new ResponseEntity<>(new RestResult(RestResultType.LACKDATA, RestResultType.LACKDATA.getMessage()), HttpStatus.OK); } diff --git a/contact-center/app/src/main/java/com/cskefu/cc/controller/api/ApiContactNotesController.java b/contact-center/app/src/main/java/com/cskefu/cc/controller/api/ApiContactNotesController.java index ff9eefed..3371b60c 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/controller/api/ApiContactNotesController.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/controller/api/ApiContactNotesController.java @@ -45,7 +45,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.Date; import java.util.List; @@ -86,7 +86,7 @@ public class ApiContactNotesController extends Handler { private JsonObject creater(final String creater) { JsonObject data = new JsonObject(); // 增加创建人 - User u = userRes.findById(creater); + User u = userRes.getReferenceById(creater); if (u != null) { data.addProperty("creater", u.getId()); data.addProperty("creatername", u.getUname()); @@ -100,7 +100,7 @@ public class ApiContactNotesController extends Handler { JsonArray y = new JsonArray(); for (final OrganUser organ : organs) { - Organ o = organRes.findOne(organ.getOrgan()); + Organ o = organRes.getReferenceById(organ.getOrgan()); if (o != null) { JsonObject x = new JsonObject(); x.addProperty("createrorgan", o.getName()); @@ -127,7 +127,7 @@ public class ApiContactNotesController extends Handler { JsonObject resp = new JsonObject(); // TODO 增加权限检查 if (j.has("id") && StringUtils.isNotBlank(j.get("id").getAsString())) { - ContactNotes cn = contactNotesRes.findOne(j.get("id").getAsString()); + ContactNotes cn = contactNotesRes.getReferenceById(j.get("id").getAsString()); if (cn != null) { JsonObject data = new JsonObject(); data.addProperty("contactid", cn.getContactid()); @@ -213,7 +213,7 @@ public class ApiContactNotesController extends Handler { if ((!payload.has("contactid")) || StringUtils.isBlank(payload.get("contactid").getAsString())) { return "参数传递不合法，没有[contactid]。"; } else { - Contacts c = contactsRes.findOne(payload.get("contactid").getAsString()); + Contacts c = contactsRes.getReferenceById(payload.get("contactid").getAsString()); if (c == null) return "参数不合法，不存在该联系人。"; } @@ -248,7 +248,7 @@ public class ApiContactNotesController extends Handler { return resp; } final String cid = j.get("contactid").getAsString(); - Contacts c = contactsRes.findOne(cid); + Contacts c = contactsRes.getReferenceById(cid); if (c == null) { resp.addProperty(RestUtils.RESP_KEY_RC, RestUtils.RESP_RC_FAIL_4); @@ -258,7 +258,7 @@ public class ApiContactNotesController extends Handler { String q = querybuilder(j); - Page cns = contactNotesRes.findByContactidOrderByCreatetimeDesc(cid, new PageRequest(super.getP(request), super.getPs(request))); + Page cns = contactNotesRes.findByContactidOrderByCreatetimeDesc(cid, PageRequest.of(super.getP(request), super.getPs(request))); resp.addProperty(RestUtils.RESP_KEY_RC, RestUtils.RESP_RC_SUCC); resp.addProperty("size", cns.getSize()); diff --git a/contact-center/app/src/main/java/com/cskefu/cc/controller/api/ApiContactTagsController.java b/contact-center/app/src/main/java/com/cskefu/cc/controller/api/ApiContactTagsController.java index 26fd99dd..43037616 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/controller/api/ApiContactTagsController.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/controller/api/ApiContactTagsController.java @@ -40,7 +40,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.HashMap; import java.util.List; @@ -129,7 +129,7 @@ public class ApiContactTagsController extends Handler { final String tagId = j.get("tagId").getAsString(); final String contactid = j.get("contactid").getAsString(); - Tag tag = tagRes.findOne(tagId); + Tag tag = tagRes.getReferenceById(tagId); if (tag == null) { resp.addProperty(RestUtils.RESP_KEY_RC, RestUtils.RESP_RC_FAIL_2); @@ -167,7 +167,7 @@ public class ApiContactTagsController extends Handler { return resp; } - TagRelation t = tagRelationRes.findOne(j.get("xid").getAsString()); + TagRelation t = tagRelationRes.getReferenceById(j.get("xid").getAsString()); if (t == null) { resp.addProperty(RestUtils.RESP_KEY_RC, RestUtils.RESP_RC_FAIL_4); resp.addProperty(RestUtils.RESP_KEY_ERROR, "该联系人没有打这个标签。"); diff --git a/contact-center/app/src/main/java/com/cskefu/cc/controller/api/ApiContactsController.java b/contact-center/app/src/main/java/com/cskefu/cc/controller/api/ApiContactsController.java index b1c0ff15..9e8fe7f4 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/controller/api/ApiContactsController.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/controller/api/ApiContactsController.java @@ -46,8 +46,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.validation.Valid; import java.util.Date; import java.util.List; import java.util.Optional; @@ -87,12 +87,12 @@ public class ApiContactsController extends Handler { if (!StringUtils.isBlank(creater)) { User user = super.getUser(request); contactsList = contactsRepository.findByCreaterAndSharesAndDatastatus(user.getId(), "all", false, - new PageRequest( + PageRequest.of( super.getP(request), super.getPs(request))); } else { contactsList = contactsRepository.findByDatastatus(false, - new PageRequest(super.getP(request), super.getPs(request))); + PageRequest.of(super.getP(request), super.getPs(request))); } return new ResponseEntity<>(new RestResult(RestResultType.OK, contactsList), HttpStatus.OK); } @@ -131,7 +131,7 @@ public class ApiContactsController extends Handler { public ResponseEntity delete(HttpServletRequest request, @Valid String id) { RestResult result = new RestResult(RestResultType.OK); if (!StringUtils.isBlank(id)) { - Contacts contacts = contactsRepository.findOne(id); + Contacts contacts = contactsRepository.getReferenceById(id); if (contacts != null) { //系统管理员， 不允许 使用 接口删除 contacts.setDatastatus(true); contactsRepository.save(contacts); diff --git a/contact-center/app/src/main/java/com/cskefu/cc/controller/api/ApiLeavemsgController.java b/contact-center/app/src/main/java/com/cskefu/cc/controller/api/ApiLeavemsgController.java index af2667f2..e52a9e7f 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/controller/api/ApiLeavemsgController.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/controller/api/ApiLeavemsgController.java @@ -34,11 +34,11 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; -import javax.servlet.http.HttpServletRequest; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; +import jakarta.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.List; @@ -64,13 +64,14 @@ public class ApiLeavemsgController extends Handler { public ResponseEntity list(HttpServletRequest request, @RequestBody RequestValues values) { Page page = agentServiceRepository.findAll((root, query, cb) -> { List list = new ArrayList<>(); + list.add(cb.equal(root.get("leavemsg").as(Boolean.class), true)); list.add(cb.equal(root.get("leavemsgstatus").as(String.class), MainContext.LeaveMsgStatus.NOTPROCESS.toString())); Predicate[] p = new Predicate[list.size()]; return cb.and(list.toArray(p)); - }, new PageRequest(super.getP(values.getQuery()), super.getPs(values.getQuery()), Sort.Direction.DESC, "createtime")); + }, PageRequest.of(super.getP(values.getQuery()), super.getPs(values.getQuery()), Sort.Direction.DESC, "createtime")); return new ResponseEntity<>(new RestResult(RestResultType.OK, page), HttpStatus.OK); } } \ No newline at end of file diff --git a/contact-center/app/src/main/java/com/cskefu/cc/controller/api/ApiOnlineUserController.java b/contact-center/app/src/main/java/com/cskefu/cc/controller/api/ApiOnlineUserController.java index 0fbddff8..f609e60e 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/controller/api/ApiOnlineUserController.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/controller/api/ApiOnlineUserController.java @@ -34,8 +34,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.validation.Valid; /** * 获取在线访客功能 @@ -59,9 +59,9 @@ public class ApiOnlineUserController extends Handler { public ResponseEntity list(HttpServletRequest request, @Valid String userid) { Page onlineUserList = null; if (!StringUtils.isBlank(userid)) { - onlineUserList = passportWebIMUserRepository.findByUserid(userid, new PageRequest(super.getP(request), super.getPs(request), Sort.Direction.DESC, "createtime")); + onlineUserList = passportWebIMUserRepository.findByUserid(userid, PageRequest.of(super.getP(request), super.getPs(request), Sort.Direction.DESC, "createtime")); } else { - onlineUserList = passportWebIMUserRepository.findByStatus(MainContext.OnlineUserStatusEnum.ONLINE.toString(), new PageRequest(super.getP(request), super.getPs(request), Sort.Direction.DESC, "createtime")); + onlineUserList = passportWebIMUserRepository.findByStatus(MainContext.OnlineUserStatusEnum.ONLINE.toString(), PageRequest.of(super.getP(request), super.getPs(request), Sort.Direction.DESC, "createtime")); } return new ResponseEntity<>(new RestResult(RestResultType.OK, onlineUserList), HttpStatus.OK); } diff --git a/contact-center/app/src/main/java/com/cskefu/cc/controller/api/ApiOrganController.java b/contact-center/app/src/main/java/com/cskefu/cc/controller/api/ApiOrganController.java index 078802fb..e0bd3f7a 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/controller/api/ApiOrganController.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/controller/api/ApiOrganController.java @@ -30,8 +30,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.validation.Valid; /** * 组织机构/部门/技能组功能 @@ -82,7 +82,7 @@ public class ApiOrganController extends Handler{ RestResult result = new RestResult(RestResultType.OK) ; Organ organ = null ; if(!StringUtils.isBlank(id)){ - organ = organRepository.findById(id) ; + organ = organRepository.getReferenceById(id) ; if(organ != null){ //系统管理员， 不允许 使用 接口删除 organRepository.delete(organ); }else{ diff --git a/contact-center/app/src/main/java/com/cskefu/cc/controller/api/ApiQualityController.java b/contact-center/app/src/main/java/com/cskefu/cc/controller/api/ApiQualityController.java index c6d785c8..453511b6 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/controller/api/ApiQualityController.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/controller/api/ApiQualityController.java @@ -34,12 +34,12 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.validation.Valid; import java.util.ArrayList; import java.util.List; @@ -70,7 +70,7 @@ public class ApiQualityController extends Handler { Predicate[] p = new Predicate[list.size()]; return cb.and(list.toArray(p)); - }, new PageRequest(super.getP(request), super.getPs(request), Sort.Direction.DESC, "createtime")); + }, PageRequest.of(super.getP(request), super.getPs(request), Sort.Direction.DESC, "createtime")); return new ResponseEntity<>(new RestResult(RestResultType.OK, page), HttpStatus.OK); } } \ No newline at end of file diff --git a/contact-center/app/src/main/java/com/cskefu/cc/controller/api/ApiServiceQueneController.java b/contact-center/app/src/main/java/com/cskefu/cc/controller/api/ApiServiceQueneController.java index 469a9c79..8aa4df23 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/controller/api/ApiServiceQueneController.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/controller/api/ApiServiceQueneController.java @@ -36,8 +36,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.validation.Valid; import java.util.Date; /** diff --git a/contact-center/app/src/main/java/com/cskefu/cc/controller/api/ApiSysDicController.java b/contact-center/app/src/main/java/com/cskefu/cc/controller/api/ApiSysDicController.java index 2f455751..87ba3924 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/controller/api/ApiSysDicController.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/controller/api/ApiSysDicController.java @@ -41,8 +41,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.validation.Valid; import java.util.Date; /** diff --git a/contact-center/app/src/main/java/com/cskefu/cc/controller/api/ApiTagsController.java b/contact-center/app/src/main/java/com/cskefu/cc/controller/api/ApiTagsController.java index b060fd8b..372b45ed 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/controller/api/ApiTagsController.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/controller/api/ApiTagsController.java @@ -41,7 +41,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * 标签 @@ -70,7 +70,7 @@ public class ApiTagsController extends Handler { tagType = j.get("tagtype").getAsString(); Page records = tagRes.findByTagtype(tagType, - new PageRequest(super.getP(request), super.getPs(request), Sort.Direction.DESC, "createtime")); + PageRequest.of(super.getP(request), super.getPs(request), Sort.Direction.DESC, "createtime")); JsonArray ja = new JsonArray(); diff --git a/contact-center/app/src/main/java/com/cskefu/cc/controller/api/ApiUserController.java b/contact-center/app/src/main/java/com/cskefu/cc/controller/api/ApiUserController.java index b5ef2956..17fcd07b 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/controller/api/ApiUserController.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/controller/api/ApiUserController.java @@ -16,12 +16,13 @@ */ package com.cskefu.cc.controller.api; +import java.util.Collections; import java.util.Date; import java.util.List; import java.util.stream.Collectors; -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.validation.Valid; import com.cskefu.cc.cache.Cache; import com.cskefu.cc.basic.Constants; @@ -54,6 +55,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Pageable; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -100,17 +102,16 @@ public class ApiUserController extends Handler { public ResponseEntity list(HttpServletRequest request, @Valid String id, @Valid String username) { Page userList = null; if (StringUtils.isNotBlank(id)) { - userList = userRes.findById( - id, new PageRequest(super.getP(request), super.getPs(request))); + userList = userRes.findByIdIn(Collections.singleton(id), PageRequest.of(super.getP(request), super.getPs(request))); } else { if (StringUtils.isNotBlank(username)) { userList = userRes.findByDatastatusAndUsernameLike( - false, username, new PageRequest( + false, username, PageRequest.of( super.getP(request), super.getPs(request))); } else { userList = userRes.findByDatastatus( - false, new PageRequest(super.getP(request), super.getPs(request))); + false, PageRequest.of(super.getP(request), super.getPs(request))); } } return new ResponseEntity<>(new RestResult(RestResultType.OK, userList), HttpStatus.OK); @@ -173,7 +174,7 @@ public class ApiUserController extends Handler { String parent = payload.get("parent").getAsString(); Organ parentOrgan = super.getOrgan(request); if (StringUtils.isNotEmpty(parent)) { - parentOrgan = organRes.getOne(parent); + parentOrgan = organRes.getReferenceById(parent); } String roleId = payload.get("role").getAsString(); @@ -185,7 +186,7 @@ public class ApiUserController extends Handler { JsonObject resp = userProxy.createNewUser(user, parentOrgan); if (StringUtils.isNotEmpty(roleId)) { - Role role = roleRes.getOne(roleId); + Role role = roleRes.getReferenceById(roleId); UserRole userRole = new UserRole(); userRole.setUser(user); userRole.setRole(role); @@ -215,7 +216,7 @@ public class ApiUserController extends Handler { return resp; } - final User previous = userRes.findById(updated.getId()); + final User previous = userRes.getReferenceById(updated.getId()); if (previous != null) { String msg = userProxy.validUserUpdate(updated, previous); if (StringUtils.equals(msg, "edit_user_success")) { @@ -286,7 +287,7 @@ public class ApiUserController extends Handler { if (payload.has("organ")) { List organUsers = organUserRes.findByOrgan(payload.get("organ").getAsString()); List userids = organUsers.stream().map(OrganUser::getUserid).collect(Collectors.toList()); - List users = userRes.findAll(userids); + List users = userRes.findAllById(userids); JsonArray data = new JsonArray(); users.stream().forEach(u -> { @@ -319,7 +320,7 @@ public class ApiUserController extends Handler { if (payload.has("id")) { String id = payload.get("id").getAsString(); if (StringUtils.isNotBlank(id)) { - User user = userRes.findById(id); + User user = userRes.getReferenceById(id); if (user == null) { // 用户不存在 resp.addProperty(RestUtils.RESP_KEY_RC, RestUtils.RESP_RC_SUCC); @@ -331,10 +332,10 @@ public class ApiUserController extends Handler { if (!user.isSuperadmin()) { // 删除用户的时候，同时删除用户对应的权限 List userRoles = userRoleRes.findByUser(user); - userRoleRes.delete(userRoles); + userRoleRes.deleteAll(userRoles); // 删除用户对应的组织机构关系 List organUsers = organUserRes.findByUserid(id); - organUserRes.delete(organUsers); + organUserRes.deleteAll(organUsers); // 删除用户 userRes.delete(user); resp.addProperty(RestUtils.RESP_KEY_RC, RestUtils.RESP_RC_SUCC); diff --git a/contact-center/app/src/main/java/com/cskefu/cc/controller/api/ApiWebIMController.java b/contact-center/app/src/main/java/com/cskefu/cc/controller/api/ApiWebIMController.java index 411a2419..a9291eb5 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/controller/api/ApiWebIMController.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/controller/api/ApiWebIMController.java @@ -30,8 +30,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.validation.Valid; /** * 在线客服 diff --git a/contact-center/app/src/main/java/com/cskefu/cc/controller/api/UkefuApiTagsController.java b/contact-center/app/src/main/java/com/cskefu/cc/controller/api/UkefuApiTagsController.java index f5b00fca..6b5c5d96 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/controller/api/UkefuApiTagsController.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/controller/api/UkefuApiTagsController.java @@ -30,8 +30,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.validation.Valid; /** * 标签功能 diff --git a/contact-center/app/src/main/java/com/cskefu/cc/controller/apps/AccountController.java b/contact-center/app/src/main/java/com/cskefu/cc/controller/apps/AccountController.java index 17d49e63..40c1dd09 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/controller/apps/AccountController.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/controller/apps/AccountController.java @@ -49,9 +49,9 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.servlet.ModelAndView; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; import java.io.File; import java.io.IOException; import java.text.SimpleDateFormat; @@ -113,7 +113,7 @@ public class AccountController extends Handler { map.addAttribute("entCustomerList", accountRes.findByOrganInAndSharesAllAndDatastatusFalse( super.getMyCurrentAffiliatesFlat(logined), - new PageRequest(super.getP(request), super.getPs(request)))); + PageRequest.of(super.getP(request), super.getPs(request)))); return request(super.createView("/apps/customer/index")); } @@ -138,7 +138,7 @@ public class AccountController extends Handler { map.addAttribute("entCustomerList", accountRes.findByCreaterAndSharesAndDatastatus(super.getUser(request).getId(), super.getUser(request).getId(), false, - new PageRequest(super.getP(request), super.getPs(request)))); + PageRequest.of(super.getP(request), super.getPs(request)))); return request(super.createView("/apps/customer/index")); } @@ -164,7 +164,7 @@ public class AccountController extends Handler { map.addAttribute("entCustomerList", accountRes.findByCreaterAndSharesAndDatastatus(super.getUser(request).getId(), super.getUser(request).getId(), false, - new PageRequest(super.getP(request), super.getPs(request)))); + PageRequest.of(super.getP(request), super.getPs(request)))); return request(super.createView("/apps/customer/index")); } @@ -190,7 +190,7 @@ public class AccountController extends Handler { map.addAttribute("entCustomerList", accountRes.findByCreaterAndSharesAndDatastatus(super.getUser(request).getId(), super.getUser(request).getId(), false, - new PageRequest(super.getP(request), super.getPs(request)))); + PageRequest.of(super.getP(request), super.getPs(request)))); return request(super.createView("/apps/customer/index")); } @@ -215,7 +215,7 @@ public class AccountController extends Handler { map.addAttribute("entCustomerList", accountRes.findByCreaterAndSharesAndDatastatus(super.getUser(request).getId(), super.getUser(request).getId(), false, - new PageRequest(super.getP(request), super.getPs(request)))); + PageRequest.of(super.getP(request), super.getPs(request)))); return request(super.createView("/apps/customer/index")); } @@ -238,7 +238,7 @@ public class AccountController extends Handler { map.put("q", q); } - map.addAttribute("entCustomerList", accountRes.findByCreaterAndSharesAndDatastatus(super.getUser(request).getId(), super.getUser(request).getId(), false, new PageRequest(super.getP(request), super.getPs(request)))); + map.addAttribute("entCustomerList", accountRes.findByCreaterAndSharesAndDatastatus(super.getUser(request).getId(), super.getUser(request).getId(), false, PageRequest.of(super.getP(request), super.getPs(request)))); return request(super.createView("/apps/customer/index")); } @@ -285,7 +285,7 @@ public class AccountController extends Handler { @Menu(type = "customer", subtype = "customer") public ModelAndView delete(HttpServletRequest request, @Valid Account account, @Valid String p, @Valid String ekind) { if (account != null) { - account = accountRes.findOne(account.getId()); + account = accountRes.getReferenceById(account.getId()); account.setDatastatus(true); //客户和联系人都是 逻辑删除 accountRes.save(account); } @@ -295,7 +295,7 @@ public class AccountController extends Handler { @RequestMapping("/edit") @Menu(type = "customer", subtype = "customer") public ModelAndView edit(ModelMap map, HttpServletRequest request, @Valid String id, @Valid String ekind) { - map.addAttribute("entCustomer", accountRes.findOne(id)); + map.addAttribute("entCustomer", accountRes.getReferenceById(id)); map.addAttribute("ekindId", ekind); return request(super.createView("/apps/customer/edit")); } @@ -304,7 +304,7 @@ public class AccountController extends Handler { @Menu(type = "customer", subtype = "customer") public ModelAndView update(HttpServletRequest request, @Valid CustomerGroupForm customerGroupForm, @Valid String ekindId) { final User logined = super.getUser(request); - Account customer = accountRes.findOne(customerGroupForm.getEntcustomer().getId()); + Account customer = accountRes.getReferenceById(customerGroupForm.getEntcustomer().getId()); String msg = ""; List events = PropertiesEventUtil.processPropertiesModify(request, customerGroupForm.getEntcustomer(), customer, "id", "creater", "createtime", "updatetime"); //记录 数据变更 历史 @@ -372,7 +372,7 @@ public class AccountController extends Handler { @Menu(type = "customer", subtype = "customer") public void expids(ModelMap map, HttpServletRequest request, HttpServletResponse response, @Valid String[] ids) throws IOException { if (ids != null && ids.length > 0) { - Iterable entCustomerList = accountRes.findAll(Arrays.asList(ids)); + Iterable entCustomerList = accountRes.findAllById(Arrays.asList(ids)); MetadataTable table = metadataRes.findByTablename("uk_entcustomer"); List> values = new ArrayList<>(); for (Account customer : entCustomerList) { @@ -403,7 +403,7 @@ public class AccountController extends Handler { map.put("ekind", ekind); } - Iterable entCustomerList = accountRes.findByCreaterAndSharesAndDatastatus(super.getUser(request).getId(), super.getUser(request).getId(), false, new PageRequest(super.getP(request), super.getPs(request))); + Iterable entCustomerList = accountRes.findByCreaterAndSharesAndDatastatus(super.getUser(request).getId(), super.getUser(request).getId(), false, PageRequest.of(super.getP(request), super.getPs(request))); MetadataTable table = metadataRes.findByTablename("uk_entcustomer"); List> values = new ArrayList<>(); @@ -441,7 +441,7 @@ public class AccountController extends Handler { super.getUser(request).getId(), false, - new PageRequest(super.getP(request), super.getPs(request))); + PageRequest.of(super.getP(request), super.getPs(request))); MetadataTable table = metadataRes.findByTablename("uk_entcustomer"); List> values = new ArrayList<>(); for (Account customer : entCustomerList) { diff --git a/contact-center/app/src/main/java/com/cskefu/cc/controller/apps/AgentAuditController.java b/contact-center/app/src/main/java/com/cskefu/cc/controller/apps/AgentAuditController.java index 5858cc37..4e312a00 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/controller/apps/AgentAuditController.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/controller/apps/AgentAuditController.java @@ -36,6 +36,7 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Sort; import org.springframework.stereotype.Controller; @@ -43,8 +44,8 @@ import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.validation.Valid; import java.io.IOException; import java.util.ArrayList; import java.util.Date; @@ -100,6 +101,7 @@ public class AgentAuditController extends Handler { private Cache cache; @Autowired + @Lazy private PeerSyncIM peerSyncIM; @Autowired @@ -149,14 +151,14 @@ public class AgentAuditController extends Handler { criterias.add(new Sort.Order(Sort.Direction.DESC, "status")); criterias.add(new Sort.Order(Sort.Direction.DESC, "createtime")); } else if (sort.equals("default")) { - defaultSort = new Sort(Sort.Direction.DESC, "status"); + defaultSort = Sort.by(Sort.Direction.DESC, "status"); } if (criterias.size() > 0) { - defaultSort = new Sort(criterias); + defaultSort = Sort.by(criterias); map.addAttribute("sort", sort); } } else { - defaultSort = new Sort(Sort.Direction.DESC, "status"); + defaultSort = Sort.by(Sort.Direction.DESC, "status"); } // 坐席对话列表 @@ -211,7 +213,7 @@ public class AgentAuditController extends Handler { final User logined = super.getUser(request); - Sort defaultSort = new Sort(Sort.Direction.DESC, "status"); + Sort defaultSort = Sort.by(Sort.Direction.DESC, "status"); // 坐席对话列表 List agentUsers; @@ -241,7 +243,7 @@ public class AgentAuditController extends Handler { public ModelAndView agentusers(HttpServletRequest request, String userid) { ModelAndView view = request(super.createView("/apps/cca/agentusers")); User logined = super.getUser(request); - Sort defaultSort = new Sort(Sort.Direction.DESC, "status"); + Sort defaultSort = Sort.by(Sort.Direction.DESC, "status"); view.addObject( "agentUserList", agentUserRes.findByStatusAndAgentnoIsNot( MainContext.AgentUserStatusEnum.INSERVICE.toString(), logined.getId(), defaultSort)); @@ -266,7 +268,7 @@ public class AgentAuditController extends Handler { } ModelAndView view = request(super.createView(mainagentuser)); final User logined = super.getUser(request); - AgentUser agentUser = agentUserRepository.findById(id); + AgentUser agentUser = agentUserRepository.getReferenceById(id); if (agentUser != null) { view.addObject("curagentuser", agentUser); @@ -277,12 +279,10 @@ public class AgentAuditController extends Handler { } view.addObject("inviteData", OnlineUserProxy.consult(agentUser.getAppid())); - List agentUserTaskList = agentUserTaskRes.findById(id); - if (agentUserTaskList.size() > 0) { - AgentUserTask agentUserTask = agentUserTaskList.get(0); - agentUserTask.setTokenum(0); - agentUserTaskRes.save(agentUserTask); - } + + AgentUserTask agentUserTask = agentUserTaskRes.getReferenceById(id); + agentUserTask.setTokenum(0); + agentUserTaskRes.save(agentUserTask); if (StringUtils.isNotBlank(agentUser.getAgentserviceid())) { List summarizes = this.serviceSummaryRes.findByAgentserviceid( @@ -295,14 +295,12 @@ public class AgentAuditController extends Handler { view.addObject( "agentUserMessageList", this.chatMessageRepository.findByUsession(agentUser.getUserid(), - new PageRequest(0, 20, Sort.Direction.DESC, - "updatetime" - ) + PageRequest.of(0, 20, Sort.Direction.DESC,"updatetime") ) ); AgentService agentService = null; if (StringUtils.isNotBlank(agentUser.getAgentserviceid())) { - agentService = this.agentServiceRes.findOne(agentUser.getAgentserviceid()); + agentService = this.agentServiceRes.getReferenceById(agentUser.getAgentserviceid()); view.addObject("curAgentService", agentService); if (agentService != null) { /** @@ -312,7 +310,7 @@ public class AgentAuditController extends Handler { } } if (MainContext.ChannelType.WEBIM.toString().equals(agentUser.getChanneltype())) { - PassportWebIMUser passportWebIMUser = onlineUserRes.findOne(agentUser.getUserid()); + PassportWebIMUser passportWebIMUser = onlineUserRes.getReferenceById(agentUser.getUserid()); if (passportWebIMUser != null) { if (passportWebIMUser.getLogintime() != null) { if (MainContext.OnlineUserStatusEnum.OFFLINE.toString().equals(passportWebIMUser.getStatus())) { @@ -333,7 +331,7 @@ public class AgentAuditController extends Handler { .toString())); view.addObject("tagRelationList", tagRelationRes.findByUserid(agentUser.getUserid())); - AgentService service = agentServiceRes.findById(agentUser.getAgentserviceid()); + AgentService service = agentServiceRes.getReferenceById(agentUser.getAgentserviceid()); if (service != null) { view.addObject("tags", tagRes.findByTagtypeAndSkill(MainContext.ModelType.USER.toString(), service.getSkill())); } @@ -370,7 +368,7 @@ public class AgentAuditController extends Handler { List skillGroups = organRes.findByIdInAndSkill(ownOrgans.keySet(), true); // 选择当前用户的默认技能组 - AgentService agentService = agentServiceRes.findById(agentserviceid); + AgentService agentService = agentServiceRes.getReferenceById(agentserviceid); String currentOrgan = agentService.getSkill(); @@ -390,7 +388,7 @@ public class AgentAuditController extends Handler { } } - final List userList = userRes.findAll(userids); + final List userList = userRes.findAllById(userids); for (final User o : userList) { o.setAgentStatus(agentStatusMap.get(o.getId())); // find user's skills @@ -403,7 +401,7 @@ public class AgentAuditController extends Handler { map.addAttribute("agentuserid", agentuserid); map.addAttribute("agentno", agentnoid); map.addAttribute("skillGroups", skillGroups); - map.addAttribute("agentservice", this.agentServiceRes.findById(agentserviceid)); + map.addAttribute("agentservice", this.agentServiceRes.getReferenceById(agentserviceid)); map.addAttribute("currentorgan", currentOrgan); } @@ -438,7 +436,7 @@ public class AgentAuditController extends Handler { } } - final List userList = userRes.findAll(userids); + final List userList = userRes.findAllById(userids); for (final User o : userList) { o.setAgentStatus(agentStatusMap.get(o.getId())); // find user's skills @@ -478,8 +476,8 @@ public class AgentAuditController extends Handler { if (StringUtils.isNotBlank(userid) && StringUtils.isNotBlank(agentuserid) && StringUtils.isNotBlank(agentno)) { - final User targetAgent = userRes.findOne(agentno); - final AgentService agentService = agentServiceRes.findById(agentserviceid); + final User targetAgent = userRes.getReferenceById(agentno); + final AgentService agentService = agentServiceRes.getReferenceById(agentserviceid); /** * 更新AgentUser */ @@ -577,7 +575,7 @@ public class AgentAuditController extends Handler { public ModelAndView end(HttpServletRequest request, @Valid String id) { final User logined = super.getUser(request); - final AgentUser agentUser = agentUserRes.findById(id); + final AgentUser agentUser = agentUserRes.getReferenceById(id); if (agentUser != null) { if ((StringUtils.equals( @@ -604,7 +602,7 @@ public class AgentAuditController extends Handler { map.addAttribute("agentuserid", agentuserid); map.addAttribute("agentserviceid", agentserviceid); map.addAttribute("userid", userid); - map.addAttribute("agentUser", agentUserRes.findById(userid)); + map.addAttribute("agentUser", agentUserRes.getReferenceById(userid)); return request(super.createView("/apps/cca/blacklistadd")); } diff --git a/contact-center/app/src/main/java/com/cskefu/cc/controller/apps/AgentController.java b/contact-center/app/src/main/java/com/cskefu/cc/controller/apps/AgentController.java index 47b2f732..50dce691 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/controller/apps/AgentController.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/controller/apps/AgentController.java @@ -43,6 +43,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; + import org.springframework.context.annotation.Lazy; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Sort; @@ -59,9 +60,9 @@ import org.springframework.web.multipart.MultipartFile; import org.springframework.web.servlet.ModelAndView; - import javax.servlet.http.HttpServletRequest; - import javax.servlet.http.HttpServletResponse; - import javax.validation.Valid; + import jakarta.servlet.http.HttpServletRequest; + import jakarta.servlet.http.HttpServletResponse; + import jakarta.validation.Valid; import java.io.File; import java.io.IOException; import java.text.ParseException; @@ -156,6 +157,7 @@ private String webUploadPath; @Autowired + @Lazy private PeerSyncIM peerSyncIM; @Autowired @@ -259,7 +261,7 @@ User logined = super.getUser(request); view.addObject( "agentUserList", agentUserRes.findByAgentno(logined.getId(), - new Sort(Direction.DESC, "status"))); + Sort.by(Direction.DESC, "status"))); List agentUserList = agentUserRes.findByUserid(userid); view.addObject( "curagentuser", agentUserList != null && agentUserList.size() > 0 ? agentUserList.get(0) : null); @@ -277,7 +279,7 @@ Integer current) throws IOException { String mainagentuserconter = "/apps/agent/mainagentuserconter"; ModelAndView view = request(super.createView(mainagentuserconter)); - AgentUser agentUser = agentUserRes.findById(id); + AgentUser agentUser = agentUserRes.getReferenceById(id); if (agentUser != null) { view.addObject("curagentuser", agentUser); view.addObject( @@ -294,7 +296,7 @@ String iconid) throws IOException { String mainagentuserconter = "/apps/agent/mainagentuserconter"; ModelAndView view = request(super.createView(mainagentuserconter)); - ChatMessage labelid = this.chatMessageRes.findById(iconid); + ChatMessage labelid = this.chatMessageRes.getReferenceById(iconid); if (labelid != null) { if (labelid.isIslabel() == false) { labelid.setIslabel(true); @@ -317,16 +319,16 @@ ) throws IOException { String mainagentuserconter = "/apps/agent/mainagentusersearch"; ModelAndView view = request(super.createView(mainagentuserconter)); - AgentUser agentUser = agentUserRes.findById(id); + AgentUser agentUser = agentUserRes.getReferenceById(id); if (agentUser != null) { Page agentUserMessageList = null; if (condition.equals("label")) { agentUserMessageList = this.chatMessageRes.findByislabel( - agentUser.getUserid(), search, new PageRequest(0, 9999, Direction.DESC, "updatetime")); + agentUser.getUserid(), search, PageRequest.of(0, 9999, Direction.DESC, "updatetime")); } else { agentUserMessageList = this.chatMessageRes.findByUsessionAndMessageContaining( - agentUser.getUserid(), search, new PageRequest(0, 9999, Direction.DESC, "updatetime")); + agentUser.getUserid(), search, PageRequest.of(0, 9999, Direction.DESC, "updatetime")); } view.addObject("agentUserMessageList", agentUserMessageList); } @@ -344,7 +346,7 @@ String thisid) throws IOException, ParseException { String mainagentuserconter = "/apps/agent/mainagentuserconter"; ModelAndView view = request(super.createView(mainagentuserconter)); - AgentUser agentUser = agentUserRes.findById(id); + AgentUser agentUser = agentUserRes.getReferenceById(id); if (agentUser != null) { SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); Date date = formatter.parse(createtime); @@ -381,7 +383,7 @@ ModelAndView view = request(super.createView(mainagentuser)); final User logined = super.getUser(request); - AgentUser agentUser = agentUserRes.findById(id); + AgentUser agentUser = agentUserRes.getReferenceById(id); if (agentUser != null) { view.addObject("curagentuser", agentUser); @@ -392,12 +394,9 @@ } view.addObject("inviteData", OnlineUserProxy.consult(agentUser.getAppid())); - List agentUserTaskList = agentUserTaskRes.findById(id); - if (agentUserTaskList.size() > 0) { - AgentUserTask agentUserTask = agentUserTaskList.get(0); - agentUserTask.setTokenum(0); - agentUserTaskRes.save(agentUserTask); - } + AgentUserTask agentUserTask = agentUserTaskRes.getReferenceById(id); + agentUserTask.setTokenum(0); + agentUserTaskRes.save(agentUserTask); if (StringUtils.isNotBlank(agentUser.getAgentserviceid())) { List summarizes = this.serviceSummaryRes.findByAgentserviceid( @@ -410,11 +409,11 @@ view.addObject( "agentUserMessageList", this.chatMessageRes.findByUsession(agentUser.getUserid(), - new PageRequest(0, 20, Direction.DESC, + PageRequest.of(0, 20, Direction.DESC, "updatetime"))); AgentService agentService = null; if (StringUtils.isNotBlank(agentUser.getAgentserviceid())) { - agentService = this.agentServiceRes.findOne(agentUser.getAgentserviceid()); + agentService = this.agentServiceRes.getReferenceById(agentUser.getAgentserviceid()); view.addObject("curAgentService", agentService); if (agentService != null) { /** @@ -430,7 +429,7 @@ view.addObject("weiXinUser", passportWechatUser); } } else if (MainContext.ChannelType.WEBIM.toString().equals(agentUser.getChanneltype())) { - PassportWebIMUser passportWebIMUser = onlineUserRes.findOne(agentUser.getUserid()); + PassportWebIMUser passportWebIMUser = onlineUserRes.getReferenceById(agentUser.getUserid()); if (passportWebIMUser != null) { if (passportWebIMUser.getLogintime() != null) { if (MainContext.OnlineUserStatusEnum.OFFLINE.toString().equals(passportWebIMUser.getStatus())) { @@ -445,12 +444,10 @@ } } else if (MainContext.ChannelType.PHONE.toString().equals(agentUser.getChanneltype())) { if (agentService != null && StringUtils.isNotBlank(agentService.getOwner())) { - StatusEvent statusEvent = this.statusEventRes.findById(agentService.getOwner()); + StatusEvent statusEvent = this.statusEventRes.getReferenceById(agentService.getOwner()); if (statusEvent != null) { if (StringUtils.isNotBlank(statusEvent.getHostid())) { - pbxHostRes.findById(statusEvent.getHostid()).ifPresent(p -> { - view.addObject("pbxHost", p); - }); + view.addObject("pbxHost", pbxHostRes.getReferenceById(statusEvent.getHostid())); } view.addObject("statusEvent", statusEvent); } @@ -465,7 +462,7 @@ view.addObject("tagRelationList", tagRelationRes.findByUserid(agentUser.getUserid())); } - AgentService service = agentServiceRes.findById(agentUser.getAgentserviceid()); + AgentService service = agentServiceRes.getReferenceById(agentUser.getAgentserviceid()); if (service != null) { view.addObject("tags", tagRes.findByTagtypeAndSkill(MainContext.ModelType.USER.toString(), service.getSkill())); } @@ -641,14 +638,14 @@ for (AgentUser agentUser : agentUserList) { if (agentUser != null && super.getUser(request).getId().equals(agentUser.getAgentno())) { acdAgentService.finishAgentUser(agentUser); - AgentService agentService = agentServiceRes.findById(agentUser.getAgentserviceid()); + AgentService agentService = agentServiceRes.getReferenceById(agentUser.getAgentserviceid()); if (agentService != null) { agentService.setStatus(MainContext.AgentUserStatusEnum.END.toString()); agentServiceList.add(agentService); } } } - agentServiceRes.save(agentServiceList); + agentServiceRes.saveAll(agentServiceList); return request(super .createView("redirect:/agent/index.html")); } @@ -669,7 +666,7 @@ logger.info("[end] end id {}", id); final User logined = super.getUser(request); - final AgentUser agentUser = agentUserRes.findById(id); + final AgentUser agentUser = agentUserRes.getReferenceById(id); if (agentUser != null) { if ((StringUtils.equals( @@ -693,12 +690,10 @@ @RequestMapping({"/readmsg"}) @Menu(type = "apps", subtype = "agent") public ModelAndView readmsg(HttpServletRequest request, @Valid String userid) { - List agentUserTaskList = agentUserTaskRes.findById(userid); - if (agentUserTaskList.size() > 0) { - AgentUserTask agentUserTask = agentUserTaskList.get(0); - agentUserTask.setTokenum(0); - agentUserTaskRes.save(agentUserTask); - } + + AgentUserTask agentUserTask = agentUserTaskRes.getReferenceById(userid); + agentUserTask.setTokenum(0); + agentUserTaskRes.save(agentUserTask); return request(super.createView("/public/success")); } @@ -709,7 +704,7 @@ map.addAttribute("agentuserid", agentuserid); map.addAttribute("agentserviceid", agentserviceid); map.addAttribute("userid", userid); - map.addAttribute("agentUser", agentUserRes.findById(userid)); + map.addAttribute("agentUser", agentUserRes.getReferenceById(userid)); return request(super.createView("/apps/agent/blacklistadd")); } @@ -788,7 +783,7 @@ JSONObject result = new JSONObject(); HttpHeaders headers = RestUtils.header(); - final AgentUser agentUser = agentUserRes.findById(id); + final AgentUser agentUser = agentUserRes.getReferenceById(id); if (multipart != null && multipart.getOriginalFilename().lastIndexOf(".") > 0) { try { @@ -813,7 +808,7 @@ @RequestMapping("/message/image") @Menu(type = "resouce", subtype = "image", access = true) public ModelAndView messageimage(HttpServletResponse response, ModelMap map, @Valid String id, @Valid String t) throws IOException { - ChatMessage message = chatMessageRes.findById(id); + ChatMessage message = chatMessageRes.getReferenceById(id); map.addAttribute("chatMessage", message); map.addAttribute("agentUser", cache.findOneAgentUserByUserId(message.getUserid())); /*if(StringUtils.isNotBlank(t)){ @@ -842,7 +837,7 @@ } // 写入临时文件 FileCopyUtils.copy(image.getBytes(), tempFile); - ChatMessage chatMessage = chatMessageRes.findById(id); + ChatMessage chatMessage = chatMessageRes.getReferenceById(id); chatMessage.setCooperation(true); chatMessageRes.save(chatMessage); @@ -852,7 +847,7 @@ MainUtils.scaleImage(imageFile, tempFile, 0.1F); // 保存到数据库 - StreamingFile sf = streamingFileRes.findOne(fileid); + StreamingFile sf = streamingFileRes.getReferenceById(fileid); if (sf != null) { sf.setCooperation(jpaBlobHelper.createBlobWithFile(imageFile)); streamingFileRes.save(sf); @@ -920,7 +915,7 @@ /** * 获得联系人 */ - Contacts contacts = contactsRes.findOne(contactsid); + Contacts contacts = contactsRes.getReferenceById(contactsid); if (contacts != null) { map.addAttribute("contacts", contacts); } @@ -928,7 +923,7 @@ /** * 在关联联系人后，更新AgentUser的显示的名字 */ - AgentUser agentUser = agentUserRes.findById(agentuserid); + AgentUser agentUser = agentUserRes.getReferenceById(agentuserid); if (agentUser != null) { agentUser.setUsername(contacts.getName()); agentUser.setNickname(contacts.getName()); @@ -946,7 +941,7 @@ onlineUserRes.save(passportWebIMUser); } - AgentService agentService = agentServiceRes.findOne(agentserviceid); + AgentService agentService = agentServiceRes.getReferenceById(agentserviceid); if (agentService != null) { agentService.setContactsid(contactsid); agentService.setUsername(contacts.getName()); @@ -978,7 +973,7 @@ public ModelAndView cleanAssociated(ModelMap map, HttpServletRequest request, final @RequestParam String currentAgentUserContactsId) { String contactsid = null; if (StringUtils.isNotEmpty(currentAgentUserContactsId)) { - AgentUserContacts agentUserContacts = agentUserContactsRes.getOne(currentAgentUserContactsId); + AgentUserContacts agentUserContacts = agentUserContactsRes.getReferenceById(currentAgentUserContactsId); if (agentUserContacts != null) { agentUserContactsRes.delete(agentUserContacts); } @@ -991,7 +986,7 @@ @RequestMapping(value = "/evaluation") @Menu(type = "apps", subtype = "evaluation") public String evaluation(HttpServletRequest request, @Valid String agentuserid) { - AgentUser agentUser = agentUserRes.findById(agentuserid); + AgentUser agentUser = agentUserRes.getReferenceById(agentuserid); Message outMessage = new Message(); outMessage.setChannelMessage(agentUser); @@ -1019,7 +1014,7 @@ @Valid String agentuserid, @Valid String channel) { if (StringUtils.isNotBlank(userid) && StringUtils.isNotBlank(agentuserid)) { - AgentUser agentUser = this.agentUserRes.findById(agentuserid); + AgentUser agentUser = this.agentUserRes.getReferenceById(agentuserid); if (agentUser != null && StringUtils.isNotBlank(agentUser.getAgentserviceid())) { List summaries = this.serviceSummaryRes.findByAgentserviceid( agentUser.getAgentserviceid()); @@ -1027,7 +1022,7 @@ map.addAttribute("summary", summaries.get(0)); } } - AgentService service = agentServiceRes.findById(agentserviceid); + AgentService service = agentServiceRes.getReferenceById(agentserviceid); if (service != null) { map.addAttribute( "tags", tagRes.findByTagtypeAndSkill( @@ -1055,7 +1050,7 @@ if (StringUtils.isNotBlank(userid) && StringUtils.isNotBlank(agentuserid)) { summary.setCreater(super.getUser(request).getId()); summary.setCreatetime(new Date()); - AgentService service = agentServiceRes.findById(agentserviceid); + AgentService service = agentServiceRes.getReferenceById(agentserviceid); summary.setAgent(service.getAgentno()); summary.setAgentno(service.getAgentno()); summary.setSkill(service.getSkill()); @@ -1103,7 +1098,7 @@ List skillGroups = organRes.findByIdInAndSkill(ownOrgans.keySet(), true); // 选择当前用户的默认技能组 - AgentService agentService = agentServiceRes.findById(agentserviceid); + AgentService agentService = agentServiceRes.getReferenceById(agentserviceid); String currentOrgan = agentService.getSkill(); @@ -1125,7 +1120,7 @@ logger.info("[transfer] get all userids except mine, {}", StringUtils.join(userids, "\t")); - final List userList = userRes.findAll(userids); + final List userList = userRes.findAllById(userids); for (final User o : userList) { o.setAgentStatus(agentStatusMap.get(o.getId())); // find user's skills @@ -1138,7 +1133,7 @@ map.addAttribute("agentuserid", agentuserid); map.addAttribute("skillGroups", skillGroups); map.addAttribute("agentno", agentService.getAgentno()); - map.addAttribute("agentservice", this.agentServiceRes.findById(agentserviceid)); + map.addAttribute("agentservice", this.agentServiceRes.getReferenceById(agentserviceid)); map.addAttribute("currentorgan", currentOrgan); } @@ -1172,7 +1167,7 @@ } } - final List userList = userRes.findAll(userids); + final List userList = userRes.findAllById(userids); for (final User o : userList) { o.setAgentStatus(agentStatusMap.get(o.getId())); // find user's skills @@ -1200,7 +1195,7 @@ @RequestParam(value = "agentuser") String agentuser, @Valid Contacts contacts) throws CSKefuException { logger.info("[agent ctrl] calloutcontactsave agentuser [{}]", agentuser); - AgentUser au = agentUserRes.findOne(agentuser); + AgentUser au = agentUserRes.getReferenceById(agentuser); if (au == null) { throw new CSKefuException("不存在该服务记录"); } @@ -1230,7 +1225,7 @@ @RequestMapping("/calloutcontact/update") @Menu(type = "apps", subtype = "calloutcontact") public ModelAndView update(HttpServletRequest request, @Valid Contacts contacts) { - Contacts data = contactsRes.findOne(contacts.getId()); + Contacts data = contactsRes.getReferenceById(contacts.getId()); if (data != null) { List events = PropertiesEventUtil.processPropertiesModify( request, contacts, data, "id", "creater", "createtime", "updatetime"); //记录 数据变更 历史 diff --git a/contact-center/app/src/main/java/com/cskefu/cc/controller/apps/AgentSettingsController.java b/contact-center/app/src/main/java/com/cskefu/cc/controller/apps/AgentSettingsController.java index e4fae96f..49d7faf4 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/controller/apps/AgentSettingsController.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/controller/apps/AgentSettingsController.java @@ -40,8 +40,8 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.servlet.ModelAndView; -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.validation.Valid; import java.io.IOException; import java.util.Date; import java.util.List; @@ -150,7 +150,7 @@ public class AgentSettingsController extends Handler { Organ currentOrgan = super.getOrgan(request); Map organs = organProxy.findAllOrganByParent(currentOrgan); - Page blackList = blackListRes.findBySkillIn(organs.keySet(), new PageRequest(super.getP(request), super.getPs(request), Sort.Direction.DESC, "endtime")); + Page blackList = blackListRes.findBySkillIn(organs.keySet(), PageRequest.of(super.getP(request), super.getPs(request), Sort.Direction.DESC, "endtime")); map.put("blackList", blackList); @@ -162,7 +162,7 @@ public class AgentSettingsController extends Handler { @Menu(type = "setting", subtype = "tag") public ModelAndView blacklistdelete(ModelMap map, HttpServletRequest request, @Valid String id) { if (!StringUtils.isBlank(id)) { - BlackEntity tempBlackEntity = blackListRes.findById(id); + BlackEntity tempBlackEntity = blackListRes.getReferenceById(id); if (tempBlackEntity != null) { blackListRes.delete(tempBlackEntity); cache.deleteSystembyId(tempBlackEntity.getUserid()); @@ -192,7 +192,7 @@ public class AgentSettingsController extends Handler { map.put("tagType", tagType); } if (tagType != null && currentOrgan != null) { - map.put("tagList", tagRes.findByTagtypeAndSkill(tagType.getCode(), currentOrgan.getId(), new PageRequest(super.getP(request), super.getPs(request)))); + map.put("tagList", tagRes.findByTagtypeAndSkill(tagType.getCode(), currentOrgan.getId(), PageRequest.of(super.getP(request), super.getPs(request)))); } map.put("tagTypeList", tagList); return request(super.createView("/apps/setting/agent/tag")); @@ -208,7 +208,7 @@ public class AgentSettingsController extends Handler { @RequestMapping("/tag/edit") @Menu(type = "setting", subtype = "tag") public ModelAndView tagedit(ModelMap map, HttpServletRequest request, @Valid String id, @Valid String tagtype) { - map.put("tag", tagRes.findOne(id)); + map.put("tag", tagRes.getReferenceById(id)); map.addAttribute("tagtype", tagtype); return request(super.createView("/apps/setting/agent/tagedit")); } @@ -247,7 +247,7 @@ public class AgentSettingsController extends Handler { @RequestMapping("/tag/delete") @Menu(type = "setting", subtype = "tag") public ModelAndView tagdelete(ModelMap map, HttpServletRequest request, @Valid String id, @Valid String tagtype) { - tagRes.delete(id); + tagRes.deleteById(id); return request(super.createView("redirect:/setting/tag.html?code=" + tagtype)); } @@ -324,7 +324,7 @@ public class AgentSettingsController extends Handler { @Menu(type = "setting", subtype = "adv") public ModelAndView advedit(ModelMap map, HttpServletRequest request, @Valid String adpos, @Valid String id) { map.addAttribute("adpos", adpos); - map.put("ad", adTypeRes.findById(id)); + map.put("ad", adTypeRes.getReferenceById(id)); return request(super.createView("/apps/setting/agent/adedit")); } @@ -358,9 +358,9 @@ public class AgentSettingsController extends Handler { @RequestMapping("/adv/delete") @Menu(type = "setting", subtype = "adv") public ModelAndView advdelete(ModelMap map, HttpServletRequest request, @Valid String id, @Valid String adpos) { - AdType adType = adTypeRes.findById(id); + AdType adType = adTypeRes.getReferenceById(id); if (adType != null) { - adTypeRes.delete(id); + adTypeRes.deleteById(id); MainUtils.initAdv(adType.getSkill()); } return request(super.createView("redirect:/setting/adv.html?adpos=" + adpos)); diff --git a/contact-center/app/src/main/java/com/cskefu/cc/controller/apps/AppsController.java b/contact-center/app/src/main/java/com/cskefu/cc/controller/apps/AppsController.java index 0a50bc13..1780f468 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/controller/apps/AppsController.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/controller/apps/AppsController.java @@ -38,8 +38,8 @@ import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.validation.Valid; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -96,7 +96,7 @@ public class AppsController extends Handler { final Page onlineUserList = onlineUserRes.findByStatusAndAppidIn( MainContext.OnlineUserStatusEnum.ONLINE.toString(), appids, - new PageRequest( + PageRequest.of( super.getP(request), super.getPs(request), Sort.Direction.DESC, @@ -122,7 +122,7 @@ public class AppsController extends Handler { * 获得在线访客与联系人的关联信息 */ if (contactIds.size() > 0) { - final Iterable contacts = contactsRes.findAll(contactIds); + final Iterable contacts = contactsRes.findAllById(contactIds); for (final PassportWebIMUser passportWebIMUser : onlineUserList.getContent()) { if (StringUtils.isNotBlank(passportWebIMUser.getContactsid())) { for (final Contacts contact : contacts) { @@ -206,7 +206,7 @@ public class AppsController extends Handler { @Menu(type = "apps", subtype = "onlineuser") public ModelAndView onlineuser(ModelMap map, HttpServletRequest request) { Page onlineUserList = this.onlineUserRes.findByStatus(MainContext.OnlineUserStatusEnum.ONLINE.toString(), - new PageRequest(super.getP(request), super.getPs(request), Sort.Direction.DESC, "createtime")); + PageRequest.of(super.getP(request), super.getPs(request), Sort.Direction.DESC, "createtime")); List ids = new ArrayList<>(); for (PassportWebIMUser passportWebIMUser : onlineUserList.getContent()) { passportWebIMUser.setBetweentime((int) (System.currentTimeMillis() - passportWebIMUser.getLogintime().getTime())); @@ -215,7 +215,7 @@ public class AppsController extends Handler { } } if (ids.size() > 0) { - Iterable contactsList = contactsRes.findAll(ids); + Iterable contactsList = contactsRes.findAllById(ids); for (PassportWebIMUser passportWebIMUser : onlineUserList.getContent()) { if (StringUtils.isNotBlank(passportWebIMUser.getContactsid())) { for (Contacts contacts : contactsList) { @@ -243,7 +243,7 @@ public class AppsController extends Handler { @RequestMapping({"/apps/profile/save"}) @Menu(type = "apps", subtype = "content") public ModelAndView profile(ModelMap map, HttpServletRequest request, @Valid User user, @Valid String index) { - User tempUser = userRes.getOne(user.getId()); + User tempUser = userRes.getReferenceById(user.getId()); final User logined = super.getUser(request); // 用户名不可修改 user.setUsername(logined.getUsername()); diff --git a/contact-center/app/src/main/java/com/cskefu/cc/controller/apps/ContactsController.java b/contact-center/app/src/main/java/com/cskefu/cc/controller/apps/ContactsController.java index 5677c21e..41f3aead 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/controller/apps/ContactsController.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/controller/apps/ContactsController.java @@ -46,9 +46,9 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.servlet.ModelAndView; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; import java.io.File; import java.io.IOException; import java.text.SimpleDateFormat; @@ -117,7 +117,7 @@ public class ContactsController extends Handler { Page contacts = contactsRes.findByOrganInAndSharesAllAndDatastatusFalse( super.getMyCurrentAffiliatesFlat(logined), - new PageRequest(super.getP(request), super.getPs(request))); + PageRequest.of(super.getP(request), super.getPs(request))); map.addAttribute("contactsList", contacts); @@ -148,7 +148,7 @@ public class ContactsController extends Handler { Page contacts = contactsRes.findByCreaterAndSharesAndDatastatus(logined.getId(), logined.getId(), false, - new PageRequest( + PageRequest.of( super.getP(request), super.getPs(request))); @@ -182,7 +182,7 @@ public class ContactsController extends Handler { Page contacts = contactsRes.findByCreaterAndSharesAndDatastatus(logined.getId(), logined.getId(), false, - new PageRequest( + PageRequest.of( super.getP(request), super.getPs(request))); map.addAttribute( @@ -216,7 +216,7 @@ public class ContactsController extends Handler { Page contacts = contactsRes.findByCreaterAndSharesAndDatastatus(logined.getId(), logined.getId(), false, - new PageRequest( + PageRequest.of( super.getP(request), super.getPs(request))); @@ -231,7 +231,7 @@ public class ContactsController extends Handler { @Menu(type = "contacts", subtype = "contacts") public ModelAndView delete(HttpServletRequest request, @Valid Contacts contacts, @Valid String p, @Valid String ckind) { if (contacts != null) { - contacts = contactsRes.findOne(contacts.getId()); + contacts = contactsRes.getReferenceById(contacts.getId()); contacts.setDatastatus(true); //客户和联系人都是 逻辑删除 contactsRes.save(contacts); } @@ -288,7 +288,7 @@ public class ContactsController extends Handler { @RequestMapping("/edit") @Menu(type = "contacts", subtype = "contacts") public ModelAndView edit(ModelMap map, HttpServletRequest request, @Valid String id, @Valid String ckind) { - map.addAttribute("contacts", contactsRes.findOne(id)); + map.addAttribute("contacts", contactsRes.getReferenceById(id)); map.addAttribute("ckindId", ckind); return request(super.createView("/apps/contacts/edit")); } @@ -299,7 +299,7 @@ public class ContactsController extends Handler { if (id == null) { return null; // id is required. Block strange requst anyway with g2.min, https://github.com/alibaba/BizCharts/issues/143 } - map.addAttribute("contacts", contactsRes.findOne(id)); + map.addAttribute("contacts", contactsRes.getReferenceById(id)); return request(super.createView("/apps/contacts/detail")); @@ -344,7 +344,7 @@ public class ContactsController extends Handler { @Menu(type = "contacts", subtype = "contacts") public ModelAndView update(HttpServletRequest request, @Valid Contacts contacts, @Valid String ckindId) { final User logined = super.getUser(request); - Contacts data = contactsRes.findOne(contacts.getId()); + Contacts data = contactsRes.getReferenceById(contacts.getId()); String msg = ""; String skypeIDReplace = contactsProxy.sanitizeSkypeId(contacts.getSkypeid()); @@ -445,7 +445,7 @@ public class ContactsController extends Handler { @Menu(type = "contacts", subtype = "contacts") public void expids(ModelMap map, HttpServletRequest request, HttpServletResponse response, @Valid String[] ids) throws IOException { if (ids != null && ids.length > 0) { - Iterable contactsList = contactsRes.findAll(Arrays.asList(ids)); + Iterable contactsList = contactsRes.findAllById(Arrays.asList(ids)); MetadataTable table = metadataRes.findByTablename("uk_contacts"); List> values = new ArrayList<>(); for (Contacts contacts : contactsList) { @@ -481,7 +481,7 @@ public class ContactsController extends Handler { } Iterable contactsList = contactsRes.findByCreaterAndSharesAndDatastatus( - logined.getId(), logined.getId(), false, new PageRequest(super.getP(request), super.getPs(request))); + logined.getId(), logined.getId(), false, PageRequest.of(super.getP(request), super.getPs(request))); MetadataTable table = metadataRes.findByTablename("uk_contacts"); List> values = new ArrayList<>(); @@ -515,7 +515,7 @@ public class ContactsController extends Handler { } Iterable contactsList = contactsRes.findByCreaterAndSharesAndDatastatus( - logined.getId(), logined.getId(), false, new PageRequest(super.getP(request), super.getPs(request))); + logined.getId(), logined.getId(), false, PageRequest.of(super.getP(request), super.getPs(request))); MetadataTable table = metadataRes.findByTablename("uk_contacts"); List> values = new ArrayList<>(); for (Contacts contacts : contactsList) { @@ -552,11 +552,11 @@ public class ContactsController extends Handler { map.put("ckind", ckind); } if (StringUtils.isNotBlank(agentserviceid)) { - AgentService service = agentServiceRes.findById(agentserviceid); + AgentService service = agentServiceRes.getReferenceById(agentserviceid); } Page contactsList = contactsRes.findByCreaterAndSharesAndDatastatus( logined.getId(), logined.getId(), false, - new PageRequest(super.getP(request), super.getPs(request))); + PageRequest.of(super.getP(request), super.getPs(request))); map.addAttribute("contactsList", contactsList); @@ -593,7 +593,7 @@ public class ContactsController extends Handler { contacts.setCreater(logined.getId()); if (StringUtils.isNotBlank(agentserviceid)) { - AgentService agentService = agentServiceRes.findOne(agentserviceid); + AgentService agentService = agentServiceRes.getReferenceById(agentserviceid); contacts.setOrgan(agentService.getSkill()); } @@ -613,7 +613,7 @@ public class ContactsController extends Handler { @RequestMapping("/embed/edit") @Menu(type = "contacts", subtype = "embededit") public ModelAndView embededit(ModelMap map, HttpServletRequest request, @Valid String id, @Valid String agentserviceid) { - map.addAttribute("contacts", contactsRes.findOne(id)); + map.addAttribute("contacts", contactsRes.getReferenceById(id)); if (StringUtils.isNotBlank(agentserviceid)) { map.addAttribute("agentserviceid", agentserviceid); } @@ -624,7 +624,7 @@ public class ContactsController extends Handler { @Menu(type = "contacts", subtype = "embedupdate") public ModelAndView embedupdate(HttpServletRequest request, @Valid Contacts contacts, @Valid String agentserviceid) { final User logined = super.getUser(request); - Contacts data = contactsRes.findOne(contacts.getId()); + Contacts data = contactsRes.getReferenceById(contacts.getId()); String msg = ""; String skypeIDReplace = contactsProxy.sanitizeSkypeId(contacts.getSkypeid()); Contacts theOnlyContact = contactsRes.findByskypeidAndDatastatus( diff --git a/contact-center/app/src/main/java/com/cskefu/cc/controller/apps/EntIMController.java b/contact-center/app/src/main/java/com/cskefu/cc/controller/apps/EntIMController.java index 73e113d8..631d6f9c 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/controller/apps/EntIMController.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/controller/apps/EntIMController.java @@ -50,9 +50,9 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.servlet.ModelAndView; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; import java.io.File; import java.io.IOException; import java.util.*; @@ -100,7 +100,7 @@ public class EntIMController extends Handler { Map organs = new HashMap<>(); user.getOrgans().values().stream().forEach(o -> { if (!StringUtils.equals(o.getParent(), "0")) { - Organ parent = organRes.findById(o.getParent()); + Organ parent = organRes.getReferenceById(o.getParent()); organs.put(parent.getId(), parent); } @@ -114,7 +114,7 @@ public class EntIMController extends Handler { user.getAffiliates().stream().forEach(p -> { if (!organs.containsKey(p)) { - Organ organ = organRes.findById(p); + Organ organ = organRes.getReferenceById(p); organs.put(p, organ); } }); @@ -177,7 +177,7 @@ public class EntIMController extends Handler { @Menu(type = "im", subtype = "entim") public ModelAndView chat(HttpServletRequest request, HttpServletResponse response, @Valid String userid) { ModelAndView view = request(super.createView("/apps/entim/chat")); - User entImUser = userRes.findById(userid); + User entImUser = userRes.getReferenceById(userid); if (entImUser != null) { userProxy.attachOrgansPropertiesForUser(entImUser); @@ -190,7 +190,7 @@ public class EntIMController extends Handler { Page chatMessageList = chatMessageRes.findByContextidAndUserid(userid, super.getUser(request).getId(), - new PageRequest(0, 20, Sort.Direction.DESC, "createtime") + PageRequest.of(0, 20, Sort.Direction.DESC, "createtime") ); view.addObject("chatMessageList", chatMessageList); @@ -233,7 +233,7 @@ public class EntIMController extends Handler { Page chatMessageList = chatMessageRes.findByContextidAndUseridAndCreatetimeLessThan(userid, super.getUser(request).getId(), createtime, - new PageRequest(0, 20, Sort.Direction.DESC, "createtime") + PageRequest.of(0, 20, Sort.Direction.DESC, "createtime") ); view.addObject("chatMessageList", chatMessageList); @@ -244,12 +244,12 @@ public class EntIMController extends Handler { @Menu(type = "im", subtype = "entim") public ModelAndView groupMore(HttpServletRequest request, HttpServletResponse response, @Valid String id) { ModelAndView view = request(super.createView("/apps/entim/group/index")); - IMGroup imGroup = imGroupRes.findById(id); + IMGroup imGroup = imGroupRes.getReferenceById(id); view.addObject("imGroup", imGroup); view.addObject("imGroupUserList", imGroupUserRes.findByImgroup(imGroup)); view.addObject("contextid", id); view.addObject("chatMessageList", chatMessageRes.findByContextid(id, - new PageRequest(0, 20, Sort.Direction.DESC, "createtime") + PageRequest.of(0, 20, Sort.Direction.DESC, "createtime") )); return view; } @@ -262,7 +262,7 @@ public class EntIMController extends Handler { ) { ModelAndView view = request(super.createView("/apps/entim/group/more")); view.addObject("chatMessageList", chatMessageRes.findByContextidAndCreatetimeLessThan(id, - createtime, new PageRequest(0, 20, Sort.Direction.DESC, "createtime") + createtime, PageRequest.of(0, 20, Sort.Direction.DESC, "createtime") )); return view; } @@ -278,8 +278,8 @@ public class EntIMController extends Handler { users.stream().forEach(u -> userProxy.attachOrgansPropertiesForUser(u)); view.addObject("userList", users); - IMGroup imGroup = imGroupRes.findById(id); - List organs = organRes.findAll(affiliates); + IMGroup imGroup = imGroupRes.getReferenceById(id); + List organs = organRes.findAllById(affiliates); view.addObject("imGroup", imGroup); view.addObject("organList", organs); @@ -331,7 +331,7 @@ public class EntIMController extends Handler { @Valid String tipmsg ) { ModelAndView view = request(super.createView("/apps/entim/group/tipmsg")); - IMGroup imGroup = imGroupRes.findById(id); + IMGroup imGroup = imGroupRes.getReferenceById(id); if (imGroup != null) { imGroup.setTipmessage(tipmsg); imGroupRes.save(imGroup); diff --git a/contact-center/app/src/main/java/com/cskefu/cc/controller/apps/IMController.java b/contact-center/app/src/main/java/com/cskefu/cc/controller/apps/IMController.java index 5cffc29b..07d93c94 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/controller/apps/IMController.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/controller/apps/IMController.java @@ -55,11 +55,11 @@ import org.springframework.web.multipart.MultipartFile; import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.mvc.method.annotation.SseEmitter; -import javax.annotation.PostConstruct; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; +import jakarta.annotation.PostConstruct; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; import java.io.File; import java.io.IOException; import java.net.URLDecoder; @@ -435,7 +435,7 @@ public class IMController extends Handler { sessionMessage.put("uid", uid); cache.putSystemMapById(sessionid, sessionMessage); - PassportWebIMUser passportWebIMUser = onlineUserRes.findOne(userid); + PassportWebIMUser passportWebIMUser = onlineUserRes.getReferenceById(userid); String updateusername; if (passportWebIMUser != null) { updateusername = username + "@" + company_name; @@ -860,7 +860,7 @@ public class IMController extends Handler { agentUserRepository.findOneByUserid(userid).ifPresent(p -> { // 关联AgentService的联系人 if (StringUtils.isNotBlank(p.getAgentserviceid())) { - AgentService agentService = agentServiceRepository.findOne( + AgentService agentService = agentServiceRepository.getReferenceById( p.getAgentserviceid()); agentService.setContactsid(contacts1.getId()); } @@ -920,7 +920,7 @@ public class IMController extends Handler { // 是否使用机器人客服 if (invite.isAi() && MainContext.hasModule(Constants.CSKEFU_MODULE_CHATBOT)) { // 查找机器人 - bot = chatbotRes.findOne(invite.getAiid()); + bot = chatbotRes.getReferenceById(invite.getAiid()); if (bot != null) { // 判断是否接受访客切换坐席类型 isEnableExchangeAgentType = !StringUtils.equals( @@ -965,7 +965,7 @@ public class IMController extends Handler { } map.addAttribute( - "chatMessageList", chatMessageRes.findByUsession(userid, new PageRequest(0, 20, + "chatMessageList", chatMessageRes.findByUsession(userid, PageRequest.of(0, 20, Direction.DESC, "updatetime"))); } @@ -1003,7 +1003,7 @@ public class IMController extends Handler { Page inviteRecords = inviteRecordRes.findByUseridAndResultAndCreatetimeGreaterThan( userid, MainContext.OnlineUserInviteStatus.DEFAULT.toString(), - threshold, new PageRequest(0, 1, Direction.DESC, "createtime")); + threshold, PageRequest.of(0, 1, Direction.DESC, "createtime")); if (inviteRecords.getContent() != null && inviteRecords.getContent().size() > 0) { final InviteRecord record = inviteRecords.getContent().get(0); record.setUpdatetime(new Date()); @@ -1249,7 +1249,7 @@ public class IMController extends Handler { userid, MainContext.OnlineUserInviteStatus.DEFAULT.toString(), threshold, - new PageRequest( + PageRequest.of( 0, 1, Direction.DESC, diff --git a/contact-center/app/src/main/java/com/cskefu/cc/controller/apps/MessageController.java b/contact-center/app/src/main/java/com/cskefu/cc/controller/apps/MessageController.java index e47cf579..8e2d2a6a 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/controller/apps/MessageController.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/controller/apps/MessageController.java @@ -24,7 +24,7 @@ import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; @Controller @RequestMapping("/message") diff --git a/contact-center/app/src/main/java/com/cskefu/cc/controller/apps/service/AgentSummaryController.java b/contact-center/app/src/main/java/com/cskefu/cc/controller/apps/service/AgentSummaryController.java index ad210f35..4fc88e5c 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/controller/apps/service/AgentSummaryController.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/controller/apps/service/AgentSummaryController.java @@ -39,10 +39,10 @@ import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; -import javax.persistence.criteria.*; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; +import jakarta.persistence.criteria.*; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; import java.io.IOException; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -105,7 +105,7 @@ public class AgentSummaryController extends Handler { } Predicate[] p = new Predicate[list.size()]; return cb.and(list.toArray(p)); - }, new PageRequest(super.getP(request), super.getPs(request), Sort.Direction.DESC, "createtime")); + }, PageRequest.of(super.getP(request), super.getPs(request), Sort.Direction.DESC, "createtime")); map.addAttribute("summaryList", page); map.addAttribute("begin", begin); map.addAttribute("end", end); @@ -118,14 +118,14 @@ public class AgentSummaryController extends Handler { @RequestMapping(value = "/process") @Menu(type = "agent", subtype = "agentsummary") public ModelAndView process(ModelMap map, HttpServletRequest request, @Valid final String id) { - AgentServiceSummary summary = serviceSummaryRes.findById(id); + AgentServiceSummary summary = serviceSummaryRes.getReferenceById(id); map.addAttribute("summary", summary); map.put("summaryTags", tagRes.findByTagtype(MainContext.ModelType.SUMMARY.toString())); if (summary != null && !StringUtils.isBlank(summary.getAgentserviceid())) { - AgentService service = agentServiceRes.findById(summary.getAgentserviceid()); + AgentService service = agentServiceRes.getReferenceById(summary.getAgentserviceid()); map.addAttribute("service", service); if (!StringUtils.isBlank(summary.getContactsid())) { - Contacts contacts = contactsRes.findOne(summary.getContactsid()); + Contacts contacts = contactsRes.getReferenceById(summary.getContactsid()); map.addAttribute("contacts", contacts); } } @@ -136,7 +136,7 @@ public class AgentSummaryController extends Handler { @RequestMapping(value = "/save") @Menu(type = "agent", subtype = "agentsummary") public ModelAndView save(ModelMap map, HttpServletRequest request, @Valid final AgentServiceSummary summary) { - AgentServiceSummary oldSummary = serviceSummaryRes.findById(summary.getId()); + AgentServiceSummary oldSummary = serviceSummaryRes.getReferenceById(summary.getId()); if (oldSummary != null) { oldSummary.setProcess(true); oldSummary.setUpdatetime(new Date()); @@ -152,7 +152,7 @@ public class AgentSummaryController extends Handler { @Menu(type = "agent", subtype = "agentsummary") public void expids(ModelMap map, HttpServletRequest request, HttpServletResponse response, @Valid String[] ids) throws IOException { if (ids != null && ids.length > 0) { - Iterable statusEventList = serviceSummaryRes.findAll(Arrays.asList(ids)); + Iterable statusEventList = serviceSummaryRes.findAllById(Arrays.asList(ids)); MetadataTable table = metadataRes.findByTablename("uk_servicesummary"); List> values = new ArrayList<>(); for (AgentServiceSummary event : statusEventList) { @@ -174,7 +174,7 @@ public class AgentSummaryController extends Handler { Organ currentOrgan = super.getOrgan(request); Map organs = organProxy.findAllOrganByParent(currentOrgan); Iterable statusEventList = serviceSummaryRes.findByChannelNotAndSkillIn( - MainContext.ChannelType.PHONE.toString(), organs.keySet(), new PageRequest(0, 10000)); + MainContext.ChannelType.PHONE.toString(), organs.keySet(), PageRequest.of(0, 10000)); MetadataTable table = metadataRes.findByTablename("uk_servicesummary"); List> values = new ArrayList<>(); for (AgentServiceSummary statusEvent : statusEventList) { @@ -207,7 +207,7 @@ public class AgentSummaryController extends Handler { } Predicate[] p = new Predicate[list.size()]; return cb.and(list.toArray(p)); - }, new PageRequest(0, 10000, Sort.Direction.DESC, "createtime")); + }, PageRequest.of(0, 10000, Sort.Direction.DESC, "createtime")); List> values = new ArrayList<>(); for (AgentServiceSummary summary : page) { diff --git a/contact-center/app/src/main/java/com/cskefu/cc/controller/apps/service/ChatServiceController.java b/contact-center/app/src/main/java/com/cskefu/cc/controller/apps/service/ChatServiceController.java index 65d0b5aa..6e7f3ca9 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/controller/apps/service/ChatServiceController.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/controller/apps/service/ChatServiceController.java @@ -36,6 +36,7 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Sort.Direction; @@ -44,9 +45,9 @@ import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; -import javax.persistence.criteria.*; -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; +import jakarta.persistence.criteria.*; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.validation.Valid; import java.nio.charset.CharacterCodingException; import java.text.ParseException; import java.util.*; @@ -100,6 +101,7 @@ public class ChatServiceController extends Handler { private Cache cache; @Autowired + @Lazy private PeerSyncIM peerSyncIM; @Autowired @@ -144,7 +146,7 @@ public class ChatServiceController extends Handler { } Predicate[] p = new Predicate[list.size()]; return cb.and(list.toArray(p)); - }, new PageRequest(super.getP(request), super.getPs(request), Direction.DESC, "createtime")); + }, PageRequest.of(super.getP(request), super.getPs(request), Direction.DESC, "createtime")); map.put("agentServiceList", page); map.put("username", username); map.put("channel", channel); @@ -168,7 +170,7 @@ public class ChatServiceController extends Handler { "agentServiceList", agentServiceRes.findByStatusAndAgentskillIn( MainContext.AgentUserStatusEnum.INSERVICE.toString(), organs.keySet(), - new PageRequest( + PageRequest.of( super.getP(request), super.getPs(request), Direction.DESC, "createtime"))); @@ -183,7 +185,7 @@ public class ChatServiceController extends Handler { Map ownOrgans = organProxy.findAllOrganByParent(targetOrgan); if (StringUtils.isNotBlank(id)) { - AgentService agentService = agentServiceRes.findById(id); + AgentService agentService = agentServiceRes.getReferenceById(id); List skillGroups = organRes.findByIdInAndSkill(ownOrgans.keySet(), true); Set organs = ownOrgans.keySet(); String currentOrgan = agentService.getSkill(); @@ -200,7 +202,7 @@ public class ChatServiceController extends Handler { usersids.add(o); } } - List userList = userRes.findAll(usersids); + List userList = userRes.findAllById(usersids); for (User user : userList) { user.setAgentStatus(cache.findOneAgentStatusByAgentno(user.getId())); userProxy.attachOrgansPropertiesForUser(user); @@ -221,8 +223,8 @@ public class ChatServiceController extends Handler { @Menu(type = "apps", subtype = "transfersave") public ModelAndView transfersave(ModelMap map, HttpServletRequest request, @Valid String id, @Valid String agentno, @Valid String memo) throws CharacterCodingException { if (StringUtils.isNotBlank(id)) { - AgentService agentService = agentServiceRes.findById(id); - final User targetAgent = userRes.findOne(agentno); + AgentService agentService = agentServiceRes.getReferenceById(id); + final User targetAgent = userRes.getReferenceById(agentno); AgentUser agentUser = null; Optional agentUserOpt = cache.findOneAgentUserByUserId( agentService.getUserid()); @@ -288,7 +290,7 @@ public class ChatServiceController extends Handler { } } } else { - agentUser = agentUserRepository.findById(agentService.getAgentuserid()); + agentUser = agentUserRepository.getReferenceById(agentService.getAgentuserid()); if (agentUser != null) { agentUser.setAgentno(agentno); agentUser.setAgentname(targetAgent.getUname()); @@ -314,10 +316,10 @@ public class ChatServiceController extends Handler { @Menu(type = "service", subtype = "current", admin = true) public ModelAndView end(ModelMap map, HttpServletRequest request, @Valid String id) throws Exception { if (StringUtils.isNotBlank(id)) { - AgentService agentService = agentServiceRes.findById(id); + AgentService agentService = agentServiceRes.getReferenceById(id); if (agentService != null) { User user = super.getUser(request); - AgentUser agentUser = agentUserRepository.findById( + AgentUser agentUser = agentUserRepository.getReferenceById( agentService.getAgentuserid()); if (agentUser != null) { acdAgentService.finishAgentUser(agentUser); @@ -345,7 +347,7 @@ public class ChatServiceController extends Handler { final HttpServletRequest request, final @Valid String id) throws Exception { if (StringUtils.isNotBlank(id)) { - AgentService agentService = agentServiceRes.findById(id); + AgentService agentService = agentServiceRes.getReferenceById(id); if (agentService != null) { final User user = super.getUser(request); if (StringUtils.isBlank(agentService.getAgentno())) { @@ -394,7 +396,7 @@ public class ChatServiceController extends Handler { Organ currentOrgan = super.getOrgan(request); Map organs = organProxy.findAllOrganByParent(currentOrgan); Page agentUserList = agentUserRes.findByStatusAndSkillIn(MainContext.AgentUserStatusEnum.INQUENE.toString(), organs.keySet(), - new PageRequest(super.getP(request), super.getPs(request), Direction.DESC, "createtime")); + PageRequest.of(super.getP(request), super.getPs(request), Direction.DESC, "createtime")); List skillGroups = new ArrayList<>(); for (AgentUser agentUser : agentUserList.getContent()) { agentUser.setWaittingtime((int) (System.currentTimeMillis() - agentUser.getCreatetime().getTime())); @@ -403,7 +405,7 @@ public class ChatServiceController extends Handler { } } if (skillGroups.size() > 0) { - List organList = organRes.findAll(skillGroups); + List organList = organRes.findAllById(skillGroups); for (AgentUser agentUser : agentUserList.getContent()) { if (StringUtils.isNotBlank(agentUser.getSkill())) { for (Organ organ : organList) { @@ -446,7 +448,7 @@ public class ChatServiceController extends Handler { } } } - List userList = userRes.findAll(usersids); + List userList = userRes.findAllById(usersids); for (User user : userList) { user.setAgentStatus(cache.findOneAgentStatusByAgentno(user.getId())); userProxy.attachOrgansPropertiesForUser(user); @@ -463,7 +465,7 @@ public class ChatServiceController extends Handler { @RequestMapping("/quene/transfer/save") @Menu(type = "service", subtype = "quenetransfer", admin = true) public ModelAndView transferSave(ModelMap map, HttpServletRequest request, @Valid String id, @Valid String skillid) { - AgentUser agentUser = agentUserRes.findById(id); + AgentUser agentUser = agentUserRes.getReferenceById(id); if (agentUser != null && agentUser.getStatus().equals(MainContext.AgentUserStatusEnum.INQUENE.toString())) { agentUser.setAgentno(null); agentUser.setSkill(skillid); @@ -479,7 +481,7 @@ public class ChatServiceController extends Handler { @Menu(type = "service", subtype = "invite", admin = true) public ModelAndView invite(ModelMap map, HttpServletRequest request, @Valid String id) throws Exception { final User logined = super.getUser(request); - AgentUser agentUser = agentUserRes.findById(id); + AgentUser agentUser = agentUserRes.getReferenceById(id); if (agentUser != null && agentUser.getStatus().equals(MainContext.AgentUserStatusEnum.INQUENE.toString())) { acdAgentService.assignVisitorAsInvite(logined.getId(), agentUser); } @@ -524,7 +526,7 @@ public class ChatServiceController extends Handler { @Menu(type = "service", subtype = "offline", admin = true) public ModelAndView offline(ModelMap map, HttpServletRequest request, @Valid String id) { - AgentStatus agentStatus = agentStatusRepository.findById(id); + AgentStatus agentStatus = agentStatusRepository.getReferenceById(id); if (agentStatus != null) { agentStatusRepository.delete(agentStatus); } @@ -547,7 +549,7 @@ public class ChatServiceController extends Handler { public ModelAndView user(ModelMap map, HttpServletRequest request) { Organ currentOrgan = super.getOrgan(request); Map organs = organProxy.findAllOrganByParent(currentOrgan); - Page userList = userProxy.findUserInOrgans(organs.keySet(), new PageRequest(super.getP(request), super.getPs(request), + Page userList = userProxy.findUserInOrgans(organs.keySet(), PageRequest.of(super.getP(request), super.getPs(request), Direction.DESC, "createtime")); Map onlines = new HashMap<>(); if (userList != null) { @@ -571,7 +573,7 @@ public class ChatServiceController extends Handler { Organ currentOrgan = super.getOrgan(request); Map organs = organProxy.findAllOrganByParent(currentOrgan); - Page leaveMsgs = leaveMsgRes.findBySkill(organs.keySet(), new PageRequest(super.getP(request), super.getPs(request), + Page leaveMsgs = leaveMsgRes.findBySkill(organs.keySet(), PageRequest.of(super.getP(request), super.getPs(request), Direction.DESC, "createtime")); logger.info("[leavemsg] current organ {}, find message size {}", currentOrgan.getId(), leaveMsgs.getSize()); for (final LeaveMsg l : leaveMsgs) { @@ -586,7 +588,7 @@ public class ChatServiceController extends Handler { @Menu(type = "service", subtype = "leavemsg", admin = true) public ModelAndView leavemsg(ModelMap map, HttpServletRequest request, @Valid String id) { if (StringUtils.isNotBlank(id)) { - leaveMsgRes.delete(id); + leaveMsgRes.deleteById(id); } return request(super.createView("redirect:/service/leavemsg/index")); } diff --git a/contact-center/app/src/main/java/com/cskefu/cc/controller/apps/service/CommentController.java b/contact-center/app/src/main/java/com/cskefu/cc/controller/apps/service/CommentController.java index a1f8cabb..56357877 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/controller/apps/service/CommentController.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/controller/apps/service/CommentController.java @@ -30,8 +30,8 @@ import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.validation.Valid; import java.util.Map; @Controller @@ -48,7 +48,7 @@ public class CommentController extends Handler { public ModelAndView index(ModelMap map, HttpServletRequest request, String userid, String agentservice, @Valid String channel) { Organ currentOrgan = super.getOrgan(request); Map organs = organProxy.findAllOrganByParent(currentOrgan); - Page agentServiceList = agentServiceRes.findBySatisfactionAndSkillIn(true, organs.keySet(), new PageRequest(super.getP(request), super.getPs(request))); + Page agentServiceList = agentServiceRes.findBySatisfactionAndSkillIn(true, organs.keySet(), PageRequest.of(super.getP(request), super.getPs(request))); map.addAttribute("serviceList", agentServiceList); return request(super.createView("/apps/service/comment/index")); } diff --git a/contact-center/app/src/main/java/com/cskefu/cc/controller/apps/service/OnlineUserController.java b/contact-center/app/src/main/java/com/cskefu/cc/controller/apps/service/OnlineUserController.java index 48df1e03..e06a154e 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/controller/apps/service/OnlineUserController.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/controller/apps/service/OnlineUserController.java @@ -38,8 +38,8 @@ import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.validation.Valid; import java.util.List; @Controller @@ -134,9 +134,9 @@ public class OnlineUserController extends Handler { agentUserContactsRes.findOneByUserid( userid).ifPresent(p -> { - map.put("contacts", contactsRes.findOne(p.getContactsid())); + map.put("contacts", contactsRes.getReferenceById(p.getContactsid())); }); - AgentService service = agentServiceRes.findById(agentservice); + AgentService service = agentServiceRes.getReferenceById(agentservice); if (service != null) { map.addAttribute( "tags", tagRes.findByTagtypeAndSkill(MainContext.ModelType.USER.toString(), service.getSkill())); @@ -150,7 +150,7 @@ public class OnlineUserController extends Handler { map.put( "agentUserMessageList", chatMessageRepository.findByAgentserviceid(agentService.getId(), - new PageRequest( + PageRequest.of( 0, 50, Direction.DESC, "updatetime"))); } @@ -162,7 +162,7 @@ public class OnlineUserController extends Handler { map.put("weiXinUser", passportWechatUser); } } else if (MainContext.ChannelType.WEBIM.toString().equals(channel)) { - PassportWebIMUser passportWebIMUser = onlineUserRes.findOne(userid); + PassportWebIMUser passportWebIMUser = onlineUserRes.getReferenceById(userid); if (passportWebIMUser != null) { map.put("onlineUser", passportWebIMUser); } @@ -181,7 +181,7 @@ public class OnlineUserController extends Handler { @RequestMapping("/online/chatmsg") @Menu(type = "service", subtype = "chatmsg", admin = true) public ModelAndView onlinechat(ModelMap map, HttpServletRequest request, String id, String title) { - AgentService agentService = agentServiceRes.getOne(id); + AgentService agentService = agentServiceRes.getReferenceById(id); map.put("curAgentService", agentService); cache.findOneAgentUserByUserId(agentService.getUserid()).ifPresent(p -> { map.put("curagentuser", p); @@ -207,7 +207,7 @@ public class OnlineUserController extends Handler { map.put( "agentUserMessageList", chatMessageRepository.findByAgentserviceid(agentService.getId(), - new PageRequest(0, 50, Direction.DESC, + PageRequest.of(0, 50, Direction.DESC, "updatetime"))); return request(super.createView("/apps/service/online/chatmsg")); @@ -223,7 +223,7 @@ public class OnlineUserController extends Handler { if (StringUtils.isNotBlank(sessionid)) { map.addAttribute( "traceHisList", userEventRes.findBySessionid(sessionid, - new PageRequest(0, 100))); + PageRequest.of(0, 100))); } return request(super.createView("/apps/service/online/trace")); } diff --git a/contact-center/app/src/main/java/com/cskefu/cc/controller/apps/service/ProcessedSummaryController.java b/contact-center/app/src/main/java/com/cskefu/cc/controller/apps/service/ProcessedSummaryController.java index cce60a8d..ff5d94ee 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/controller/apps/service/ProcessedSummaryController.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/controller/apps/service/ProcessedSummaryController.java @@ -39,10 +39,10 @@ import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; -import javax.persistence.criteria.*; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; +import jakarta.persistence.criteria.*; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; import java.io.IOException; import java.text.SimpleDateFormat; import java.util.*; @@ -110,7 +110,7 @@ public class ProcessedSummaryController extends Handler { } Predicate[] p = new Predicate[list.size()]; return cb.and(list.toArray(p)); - }, new PageRequest(super.getP(request), super.getPs(request), Sort.Direction.DESC, "createtime")); + }, PageRequest.of(super.getP(request), super.getPs(request), Sort.Direction.DESC, "createtime")); map.addAttribute("summaryList", page); map.addAttribute("ani", ani); map.addAttribute("called", called); @@ -126,14 +126,14 @@ public class ProcessedSummaryController extends Handler { @RequestMapping(value = "/process") @Menu(type = "agent", subtype = "processed") public ModelAndView process(ModelMap map, HttpServletRequest request, @Valid final String id) { - AgentServiceSummary summary = serviceSummaryRes.findById(id); + AgentServiceSummary summary = serviceSummaryRes.getReferenceById(id); map.addAttribute("summary", summary); map.put("summaryTags", tagRes.findByTagtype(MainContext.ModelType.SUMMARY.toString())); if (summary != null && !StringUtils.isBlank(summary.getAgentserviceid())) { - AgentService service = agentServiceRes.findById(summary.getAgentserviceid()); + AgentService service = agentServiceRes.getReferenceById(summary.getAgentserviceid()); map.addAttribute("service", service); if (!StringUtils.isBlank(summary.getContactsid())) { - Contacts contacts = contactsRes.findOne(summary.getContactsid()); + Contacts contacts = contactsRes.getReferenceById(summary.getContactsid()); map.addAttribute("contacts", contacts); } } @@ -144,7 +144,7 @@ public class ProcessedSummaryController extends Handler { @RequestMapping(value = "/save") @Menu(type = "agent", subtype = "processed") public ModelAndView save(ModelMap map, HttpServletRequest request, @Valid final AgentServiceSummary summary) { - AgentServiceSummary oldSummary = serviceSummaryRes.findById(summary.getId()); + AgentServiceSummary oldSummary = serviceSummaryRes.getReferenceById(summary.getId()); if (oldSummary != null) { oldSummary.setProcess(true); oldSummary.setUpdatetime(new Date()); @@ -160,7 +160,7 @@ public class ProcessedSummaryController extends Handler { @Menu(type = "agent", subtype = "processed") public void expids(ModelMap map, HttpServletRequest request, HttpServletResponse response, @Valid String[] ids) throws IOException { if (ids != null && ids.length > 0) { - Iterable statusEventList = serviceSummaryRes.findAll(Arrays.asList(ids)); + Iterable statusEventList = serviceSummaryRes.findAllById(Arrays.asList(ids)); MetadataTable table = metadataRes.findByTablename("uk_servicesummary"); List> values = new ArrayList<>(); for (AgentServiceSummary event : statusEventList) { @@ -182,7 +182,7 @@ public class ProcessedSummaryController extends Handler { Organ currentOrgan = super.getOrgan(request); Map organs = organProxy.findAllOrganByParent(currentOrgan); Iterable statusEventList = serviceSummaryRes.findByChannelNotAndProcessTrueAndSkillIn( - MainContext.ChannelType.PHONE.toString(), organs.keySet(), new PageRequest(0, 10000)); + MainContext.ChannelType.PHONE.toString(), organs.keySet(), PageRequest.of(0, 10000)); MetadataTable table = metadataRes.findByTablename("uk_servicesummary"); List> values = new ArrayList<>(); @@ -221,7 +221,7 @@ public class ProcessedSummaryController extends Handler { } Predicate[] p = new Predicate[list.size()]; return cb.and(list.toArray(p)); - }, new PageRequest(0, 10000, Sort.Direction.DESC, "createtime")); + }, PageRequest.of(0, 10000, Sort.Direction.DESC, "createtime")); List> values = new ArrayList<>(); for (AgentServiceSummary summary : page) { diff --git a/contact-center/app/src/main/java/com/cskefu/cc/controller/apps/service/StatsController.java b/contact-center/app/src/main/java/com/cskefu/cc/controller/apps/service/StatsController.java index 08748361..1bfff2e0 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/controller/apps/service/StatsController.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/controller/apps/service/StatsController.java @@ -39,9 +39,9 @@ import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; diff --git a/contact-center/app/src/main/java/com/cskefu/cc/controller/auth/ApiAuthBearerController.java b/contact-center/app/src/main/java/com/cskefu/cc/controller/auth/ApiAuthBearerController.java index ebba2ea2..a06f0a21 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/controller/auth/ApiAuthBearerController.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/controller/auth/ApiAuthBearerController.java @@ -37,10 +37,10 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; import java.util.Date; import java.util.List; diff --git a/contact-center/app/src/main/java/com/cskefu/cc/controller/auth/ApiAuthErrorController.java b/contact-center/app/src/main/java/com/cskefu/cc/controller/auth/ApiAuthErrorController.java index dc58af1b..db821954 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/controller/auth/ApiAuthErrorController.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/controller/auth/ApiAuthErrorController.java @@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * Token验证失败 diff --git a/contact-center/app/src/main/java/com/cskefu/cc/controller/resource/CallAgentResourceController.java b/contact-center/app/src/main/java/com/cskefu/cc/controller/resource/CallAgentResourceController.java index 0bb433a7..a19cc1c5 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/controller/resource/CallAgentResourceController.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/controller/resource/CallAgentResourceController.java @@ -31,13 +31,13 @@ import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaBuilder.In; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaBuilder.In; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.validation.Valid; import java.util.ArrayList; import java.util.List; diff --git a/contact-center/app/src/main/java/com/cskefu/cc/controller/resource/ContactsResourceController.java b/contact-center/app/src/main/java/com/cskefu/cc/controller/resource/ContactsResourceController.java index 6e6aff70..9aef5230 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/controller/resource/ContactsResourceController.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/controller/resource/ContactsResourceController.java @@ -30,8 +30,8 @@ import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.validation.Valid; @Controller public class ContactsResourceController extends Handler { @@ -46,7 +46,7 @@ public class ContactsResourceController extends Handler { if (q == null) { q = ""; } - Page contactsList = contactsRes.findByCreaterAndSharesAndDatastatus(super.getUser(request).getId(), super.getUser(request).getId(), false, new PageRequest(0, 10)); + Page contactsList = contactsRes.findByCreaterAndSharesAndDatastatus(super.getUser(request).getId(), super.getUser(request).getId(), false, PageRequest.of(0, 10)); JSONArray result = new JSONArray(); for (Contacts contact : contactsList.getContent()) { diff --git a/contact-center/app/src/main/java/com/cskefu/cc/controller/resource/CssResourceController.java b/contact-center/app/src/main/java/com/cskefu/cc/controller/resource/CssResourceController.java index ed7dbbfb..c0bfeda7 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/controller/resource/CssResourceController.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/controller/resource/CssResourceController.java @@ -19,27 +19,26 @@ package com.cskefu.cc.controller.resource; import com.cskefu.cc.controller.Handler; import com.cskefu.cc.util.Menu; import org.springframework.stereotype.Controller; +import org.springframework.util.MimeTypeUtils; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; -import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; import java.io.IOException; @Controller public class CssResourceController extends Handler{ - @RequestMapping("/res/css") + @RequestMapping(value = "/res/css") @Menu(type = "resouce" , subtype = "css" , access = true) public ModelAndView index(HttpServletResponse response, @Valid String id) throws IOException { - response.setContentType("text/css ; charset=UTF-8"); return request(super.createView("/resource/css/ukefu")); } - @RequestMapping("/res/css/system") + @RequestMapping(value = "/res/css/system") @Menu(type = "resouce" , subtype = "css" , access = true) public ModelAndView system(HttpServletResponse response, @Valid String id) throws IOException { - response.setContentType("text/css ; charset=UTF-8"); return request(super.createView("/resource/css/system")); } } \ No newline at end of file diff --git a/contact-center/app/src/main/java/com/cskefu/cc/controller/resource/MediaController.java b/contact-center/app/src/main/java/com/cskefu/cc/controller/resource/MediaController.java index cd072239..86764d30 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/controller/resource/MediaController.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/controller/resource/MediaController.java @@ -41,9 +41,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.multipart.MultipartFile; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; import java.util.regex.Pattern; import java.io.File; import java.io.IOException; @@ -77,7 +77,7 @@ public class MediaController extends Handler { @Valid String id, @RequestParam(value = "original", required = false) boolean original, @RequestParam(value = "cooperation", required = false) boolean cooperation) throws IOException, SQLException { - StreamingFile sf = streamingFileRes.findOne(id); + StreamingFile sf = streamingFileRes.getReferenceById(id); if (sf != null) { response.setHeader("Content-Type", sf.getMime()); response.setContentType(sf.getMime()); @@ -149,9 +149,9 @@ public class MediaController extends Handler { @Menu(type = "resouce", subtype = "file") public void file(HttpServletResponse response, HttpServletRequest request, @Valid String id) throws IOException, SQLException { if (StringUtils.isNotBlank(id)) { - AttachmentFile attachmentFile = attachementRes.findById(id); + AttachmentFile attachmentFile = attachementRes.getReferenceById(id); if (attachmentFile != null && attachmentFile.getFileid() != null) { - StreamingFile sf = streamingFileRes.findOne(attachmentFile.getFileid()); + StreamingFile sf = streamingFileRes.getReferenceById(attachmentFile.getFileid()); if (sf != null) { response.setContentType(attachmentFile.getFiletype()); response.setHeader("Content-Disposition", "attachment;filename=" + java.net.URLEncoder.encode(attachmentFile.getTitle(), "UTF-8")); diff --git a/contact-center/app/src/main/java/com/cskefu/cc/controller/resource/SysDicResourceController.java b/contact-center/app/src/main/java/com/cskefu/cc/controller/resource/SysDicResourceController.java index a3dbace0..2953a6e0 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/controller/resource/SysDicResourceController.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/controller/resource/SysDicResourceController.java @@ -25,8 +25,8 @@ import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; -import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; import java.io.IOException; import java.util.ArrayList; import java.util.List; diff --git a/contact-center/app/src/main/java/com/cskefu/cc/controller/resource/UsersResourceController.java b/contact-center/app/src/main/java/com/cskefu/cc/controller/resource/UsersResourceController.java index ff971ceb..d8c26f79 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/controller/resource/UsersResourceController.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/controller/resource/UsersResourceController.java @@ -33,8 +33,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.servlet.ModelAndView; -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.validation.Valid; import java.util.List; @Controller @@ -99,7 +99,7 @@ public class UsersResourceController extends Handler { if (q == null) { q = ""; } - Page list = userRes.findByDatastatusAndUsernameLike(false, "%" + q + "%", new PageRequest(0, 10)); + Page list = userRes.findByDatastatusAndUsernameLike(false, "%" + q + "%", PageRequest.of(0, 10)); return list; } diff --git a/contact-center/app/src/main/java/com/cskefu/cc/interceptor/CrossInterceptorHandler.java b/contact-center/app/src/main/java/com/cskefu/cc/interceptor/CrossInterceptorHandler.java index 4f1ca6dc..16d109fb 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/interceptor/CrossInterceptorHandler.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/interceptor/CrossInterceptorHandler.java @@ -18,12 +18,12 @@ package com.cskefu.cc.interceptor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; +import org.springframework.web.servlet.HandlerInterceptor; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; -public class CrossInterceptorHandler extends HandlerInterceptorAdapter { +public class CrossInterceptorHandler implements HandlerInterceptor { private final static Logger logger = LoggerFactory.getLogger(CrossInterceptorHandler.class); public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) diff --git a/contact-center/app/src/main/java/com/cskefu/cc/interceptor/RequestLogIntercreptorHandler.java b/contact-center/app/src/main/java/com/cskefu/cc/interceptor/RequestLogIntercreptorHandler.java index edb751a3..ce1dce60 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/interceptor/RequestLogIntercreptorHandler.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/interceptor/RequestLogIntercreptorHandler.java @@ -31,8 +31,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.method.HandlerMethod; import org.springframework.web.servlet.ModelAndView; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.Date; import java.util.Enumeration; diff --git a/contact-center/app/src/main/java/com/cskefu/cc/interceptor/UserExperiencePlanInterceptorHandler.java b/contact-center/app/src/main/java/com/cskefu/cc/interceptor/UserExperiencePlanInterceptorHandler.java index 832e71bb..5d19e119 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/interceptor/UserExperiencePlanInterceptorHandler.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/interceptor/UserExperiencePlanInterceptorHandler.java @@ -21,15 +21,15 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.servlet.ModelAndView; -import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; +import org.springframework.web.servlet.HandlerInterceptor; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * 用户体验计划 */ -public class UserExperiencePlanInterceptorHandler extends HandlerInterceptorAdapter { +public class UserExperiencePlanInterceptorHandler implements HandlerInterceptor { private static final Logger logger = LoggerFactory.getLogger(UserExperiencePlanInterceptorHandler.class); public final static String FLAG_KEY = "cskefu:global:user-experience-plan"; private static RedisCommand redis; diff --git a/contact-center/app/src/main/java/com/cskefu/cc/interceptor/UserInterceptorHandler.java b/contact-center/app/src/main/java/com/cskefu/cc/interceptor/UserInterceptorHandler.java index 110c786d..863f249c 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/interceptor/UserInterceptorHandler.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/interceptor/UserInterceptorHandler.java @@ -32,15 +32,15 @@ import com.cskefu.cc.util.PugHelper; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.boot.autoconfigure.web.BasicErrorController; +import org.springframework.boot.autoconfigure.web.servlet.error.BasicErrorController; import org.springframework.web.method.HandlerMethod; import org.springframework.web.servlet.ModelAndView; -import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; +import org.springframework.web.servlet.HandlerInterceptor; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; -public class UserInterceptorHandler extends HandlerInterceptorAdapter { +public class UserInterceptorHandler implements HandlerInterceptor { private final static Logger logger = LoggerFactory.getLogger(UserInterceptorHandler.class); private static UserProxy userProxy; private static OrganProxy organProxy; diff --git a/contact-center/app/src/main/java/com/cskefu/cc/interceptor/ViewsInterceptorHandler.java b/contact-center/app/src/main/java/com/cskefu/cc/interceptor/ViewsInterceptorHandler.java index 36d862f1..dd736f2e 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/interceptor/ViewsInterceptorHandler.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/interceptor/ViewsInterceptorHandler.java @@ -20,12 +20,12 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.servlet.ModelAndView; -import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; +import org.springframework.web.servlet.HandlerInterceptor; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; -public class ViewsInterceptorHandler extends HandlerInterceptorAdapter { +public class ViewsInterceptorHandler implements HandlerInterceptor { private final static Logger logger = LoggerFactory.getLogger(ViewsInterceptorHandler.class); @Override diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/Account.java b/contact-center/app/src/main/java/com/cskefu/cc/model/Account.java index 8af8acb1..f8f7e7c3 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/Account.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/Account.java @@ -20,7 +20,7 @@ package com.cskefu.cc.model; import com.cskefu.cc.basic.MainUtils; import org.hibernate.annotations.GenericGenerator; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Date; @Entity diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/Acl.java b/contact-center/app/src/main/java/com/cskefu/cc/model/Acl.java index 6b4cdc1d..5c48c07b 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/Acl.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/Acl.java @@ -18,7 +18,7 @@ package com.cskefu.cc.model; import org.hibernate.annotations.GenericGenerator; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Date; @Entity diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/AdType.java b/contact-center/app/src/main/java/com/cskefu/cc/model/AdType.java index 6a9353c5..91936c48 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/AdType.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/AdType.java @@ -18,7 +18,7 @@ package com.cskefu.cc.model; import org.hibernate.annotations.GenericGenerator; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Date; @Entity diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/AgentReport.java b/contact-center/app/src/main/java/com/cskefu/cc/model/AgentReport.java index a05fa681..db75104d 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/AgentReport.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/AgentReport.java @@ -19,7 +19,7 @@ package com.cskefu.cc.model; import com.cskefu.cc.basic.MainUtils; import org.hibernate.annotations.GenericGenerator; -import javax.persistence.*; +import jakarta.persistence.*; import java.text.SimpleDateFormat; import java.util.Date; diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/AgentService.java b/contact-center/app/src/main/java/com/cskefu/cc/model/AgentService.java index 93fc1d31..59469971 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/AgentService.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/AgentService.java @@ -21,7 +21,7 @@ import com.cskefu.cc.basic.MainUtils; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Proxy; -import javax.persistence.*; +import jakarta.persistence.*; import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.Date; diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/AgentServiceSatis.java b/contact-center/app/src/main/java/com/cskefu/cc/model/AgentServiceSatis.java index 436b82dd..004e9b93 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/AgentServiceSatis.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/AgentServiceSatis.java @@ -19,7 +19,7 @@ package com.cskefu.cc.model; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Proxy; -import javax.persistence.*; +import jakarta.persistence.*; import java.io.Serializable; import java.util.Date; diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/AgentServiceSummary.java b/contact-center/app/src/main/java/com/cskefu/cc/model/AgentServiceSummary.java index d188ef9c..ea18a5ae 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/AgentServiceSummary.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/AgentServiceSummary.java @@ -19,7 +19,7 @@ package com.cskefu.cc.model; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Proxy; -import javax.persistence.*; +import jakarta.persistence.*; import java.io.Serializable; import java.util.Date; diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/AgentStatus.java b/contact-center/app/src/main/java/com/cskefu/cc/model/AgentStatus.java index 1a2f3a1b..47d855eb 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/AgentStatus.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/AgentStatus.java @@ -20,7 +20,7 @@ import com.cskefu.cc.acd.ACDServiceRouter; import com.cskefu.cc.basic.MainContext; import org.hibernate.annotations.GenericGenerator; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Date; import java.util.HashMap; diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/AgentUser.java b/contact-center/app/src/main/java/com/cskefu/cc/model/AgentUser.java index 7113ce13..85e0d4d7 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/AgentUser.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/AgentUser.java @@ -20,7 +20,7 @@ import com.cskefu.cc.basic.MainUtils; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Proxy; -import javax.persistence.*; +import jakarta.persistence.*; import java.io.Serializable; import java.util.Date; diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/AgentUserContacts.java b/contact-center/app/src/main/java/com/cskefu/cc/model/AgentUserContacts.java index 1dc89e0e..01b91eea 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/AgentUserContacts.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/AgentUserContacts.java @@ -19,7 +19,7 @@ package com.cskefu.cc.model; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Proxy; -import javax.persistence.*; +import jakarta.persistence.*; import java.io.Serializable; import java.util.Date; diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/AgentUserTask.java b/contact-center/app/src/main/java/com/cskefu/cc/model/AgentUserTask.java index 66d2f04e..3b1395c6 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/AgentUserTask.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/AgentUserTask.java @@ -19,7 +19,7 @@ package com.cskefu.cc.model; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Proxy; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Date; @Entity diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/AreaType.java b/contact-center/app/src/main/java/com/cskefu/cc/model/AreaType.java index 376e203a..d78c60f3 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/AreaType.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/AreaType.java @@ -18,7 +18,7 @@ package com.cskefu.cc.model; import org.hibernate.annotations.GenericGenerator; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Date; @Entity diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/AttachmentFile.java b/contact-center/app/src/main/java/com/cskefu/cc/model/AttachmentFile.java index 384e87f2..ad41f67e 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/AttachmentFile.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/AttachmentFile.java @@ -19,7 +19,7 @@ package com.cskefu.cc.model; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Proxy; -import javax.persistence.*; +import jakarta.persistence.*; import java.io.Serializable; import java.util.Date; diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/BlackEntity.java b/contact-center/app/src/main/java/com/cskefu/cc/model/BlackEntity.java index 64b98605..4249633e 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/BlackEntity.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/BlackEntity.java @@ -18,7 +18,7 @@ package com.cskefu.cc.model; import org.hibernate.annotations.GenericGenerator; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Date; @Entity diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/CallAgent.java b/contact-center/app/src/main/java/com/cskefu/cc/model/CallAgent.java index fc83dab7..1afae0bb 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/CallAgent.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/CallAgent.java @@ -18,7 +18,7 @@ package com.cskefu.cc.model; import org.hibernate.annotations.GenericGenerator; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Date; import java.util.concurrent.atomic.AtomicInteger; diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/CallCenterSkill.java b/contact-center/app/src/main/java/com/cskefu/cc/model/CallCenterSkill.java index 98480744..0550526e 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/CallCenterSkill.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/CallCenterSkill.java @@ -19,7 +19,7 @@ package com.cskefu.cc.model; import org.hibernate.annotations.GenericGenerator; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Date; @Entity diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/Channel.java b/contact-center/app/src/main/java/com/cskefu/cc/model/Channel.java index e4559ec4..1a9eb5b6 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/Channel.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/Channel.java @@ -19,7 +19,7 @@ package com.cskefu.cc.model; import org.hibernate.annotations.GenericGenerator; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Date; @Entity diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/Chatbot.java b/contact-center/app/src/main/java/com/cskefu/cc/model/Chatbot.java index a81362b9..0c8ef884 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/Chatbot.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/Chatbot.java @@ -17,7 +17,7 @@ package com.cskefu.cc.model; import org.hibernate.annotations.GenericGenerator; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Date; @Entity diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/ColumnProperties.java b/contact-center/app/src/main/java/com/cskefu/cc/model/ColumnProperties.java index 2e257b86..f683b00d 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/ColumnProperties.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/ColumnProperties.java @@ -18,7 +18,7 @@ package com.cskefu.cc.model; import org.hibernate.annotations.GenericGenerator; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "uk_columnproperties") diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/ContactNotes.java b/contact-center/app/src/main/java/com/cskefu/cc/model/ContactNotes.java index 60fbe5ca..7749294b 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/ContactNotes.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/ContactNotes.java @@ -19,7 +19,7 @@ package com.cskefu.cc.model; import com.cskefu.cc.basic.MainUtils; import org.hibernate.annotations.GenericGenerator; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Date; @Entity diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/Contacts.java b/contact-center/app/src/main/java/com/cskefu/cc/model/Contacts.java index 1a713f72..385897f6 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/Contacts.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/Contacts.java @@ -19,7 +19,7 @@ package com.cskefu.cc.model; import com.cskefu.cc.basic.MainUtils; import org.hibernate.annotations.GenericGenerator; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Date; @Entity diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/CousultInvite.java b/contact-center/app/src/main/java/com/cskefu/cc/model/CousultInvite.java index 4311b135..10a24cd3 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/CousultInvite.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/CousultInvite.java @@ -18,7 +18,7 @@ package com.cskefu.cc.model; import org.hibernate.annotations.GenericGenerator; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Date; @Entity diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/CubeLevel.java b/contact-center/app/src/main/java/com/cskefu/cc/model/CubeLevel.java index 8ac313a4..8b4a8ff8 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/CubeLevel.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/CubeLevel.java @@ -20,7 +20,7 @@ import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Date; @Entity @Table(name = "uk_cubelevel") diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/CubeMeasure.java b/contact-center/app/src/main/java/com/cskefu/cc/model/CubeMeasure.java index 945512cb..d6208009 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/CubeMeasure.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/CubeMeasure.java @@ -18,7 +18,7 @@ package com.cskefu.cc.model; import org.hibernate.annotations.GenericGenerator; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Date; @Entity @Table(name = "uk_cubemeasure") diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/CubeType.java b/contact-center/app/src/main/java/com/cskefu/cc/model/CubeType.java index ac340596..2035a456 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/CubeType.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/CubeType.java @@ -18,7 +18,7 @@ package com.cskefu.cc.model; import org.hibernate.annotations.GenericGenerator; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Date; @Entity diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/CustomerGroupForm.java b/contact-center/app/src/main/java/com/cskefu/cc/model/CustomerGroupForm.java index f8134879..56ed54c2 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/CustomerGroupForm.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/CustomerGroupForm.java @@ -16,7 +16,7 @@ */ package com.cskefu.cc.model; -import javax.validation.Valid; +import jakarta.validation.Valid; public class CustomerGroupForm { @Valid diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/DataDic.java b/contact-center/app/src/main/java/com/cskefu/cc/model/DataDic.java index b8d27f86..331af1a5 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/DataDic.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/DataDic.java @@ -18,7 +18,7 @@ package com.cskefu.cc.model; import org.hibernate.annotations.GenericGenerator; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Date; diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/DataEvent.java b/contact-center/app/src/main/java/com/cskefu/cc/model/DataEvent.java index b383f55a..d0082992 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/DataEvent.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/DataEvent.java @@ -19,7 +19,7 @@ package com.cskefu.cc.model; import org.hibernate.annotations.GenericGenerator; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Date; import java.util.List; @@ -118,7 +118,9 @@ public class DataEvent implements java.io.Serializable{ public void setEventtype(String eventtype) { this.eventtype = eventtype; } - @OneToMany(cascade=CascadeType.ALL,fetch=FetchType.LAZY,mappedBy="modifyid") + + @OneToMany(cascade=CascadeType.ALL,fetch=FetchType.LAZY) + @JoinColumn(name="modifyid") public List getEventList() { return eventList; } diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/Dimension.java b/contact-center/app/src/main/java/com/cskefu/cc/model/Dimension.java index 500b30fc..79e4e5c2 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/Dimension.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/Dimension.java @@ -18,7 +18,7 @@ package com.cskefu.cc.model; import org.hibernate.annotations.GenericGenerator; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Date; import java.util.List; @Entity diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/DrillDown.java b/contact-center/app/src/main/java/com/cskefu/cc/model/DrillDown.java index e336766d..0ebe0130 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/DrillDown.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/DrillDown.java @@ -18,7 +18,7 @@ package com.cskefu.cc.model; import org.hibernate.annotations.GenericGenerator; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Map; @Entity diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/Extension.java b/contact-center/app/src/main/java/com/cskefu/cc/model/Extension.java index f1e97a88..7f7e19a9 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/Extension.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/Extension.java @@ -21,7 +21,7 @@ package com.cskefu.cc.model; import com.cskefu.cc.basic.MainContext; import org.hibernate.annotations.GenericGenerator; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Date; @Entity diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/FbMessenger.java b/contact-center/app/src/main/java/com/cskefu/cc/model/FbMessenger.java index da8aedc9..a1efda9d 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/FbMessenger.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/FbMessenger.java @@ -20,7 +20,7 @@ import com.alibaba.fastjson.JSONObject; import org.apache.commons.lang3.StringUtils; import org.hibernate.annotations.GenericGenerator; -import javax.persistence.*; +import jakarta.persistence.*; import java.io.Serializable; import java.util.Date; import java.util.Map; diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/FbOTN.java b/contact-center/app/src/main/java/com/cskefu/cc/model/FbOTN.java index ee4c7138..a2484c1d 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/FbOTN.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/FbOTN.java @@ -20,7 +20,7 @@ import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; -import javax.persistence.*; +import jakarta.persistence.*; import java.io.Serializable; import java.util.Date; diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/FbOtnFollow.java b/contact-center/app/src/main/java/com/cskefu/cc/model/FbOtnFollow.java index ca7b627d..335ebe6c 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/FbOtnFollow.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/FbOtnFollow.java @@ -19,7 +19,7 @@ package com.cskefu.cc.model; import org.hibernate.annotations.GenericGenerator; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Date; @Entity diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/FormFilter.java b/contact-center/app/src/main/java/com/cskefu/cc/model/FormFilter.java index 61d33e2b..875a4ee2 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/FormFilter.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/FormFilter.java @@ -19,7 +19,7 @@ package com.cskefu.cc.model; import org.hibernate.annotations.GenericGenerator; -import javax.persistence.*; +import jakarta.persistence.*; import java.io.Serializable; import java.util.Date; diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/FormFilterItem.java b/contact-center/app/src/main/java/com/cskefu/cc/model/FormFilterItem.java index 01d2a70b..56570c38 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/FormFilterItem.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/FormFilterItem.java @@ -20,7 +20,7 @@ package com.cskefu.cc.model; import com.cskefu.cc.basic.MainUtils; import org.hibernate.annotations.GenericGenerator; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Date; @Entity diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/Generation.java b/contact-center/app/src/main/java/com/cskefu/cc/model/Generation.java index 59146fb5..fae6c924 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/Generation.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/Generation.java @@ -19,7 +19,7 @@ package com.cskefu.cc.model; import org.hibernate.annotations.GenericGenerator; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Date; @Entity diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/IMGroup.java b/contact-center/app/src/main/java/com/cskefu/cc/model/IMGroup.java index b409b4de..88738379 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/IMGroup.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/IMGroup.java @@ -20,7 +20,7 @@ package com.cskefu.cc.model; import org.hibernate.annotations.GenericGenerator; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Date; @Entity diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/IMGroupUser.java b/contact-center/app/src/main/java/com/cskefu/cc/model/IMGroupUser.java index bb0099e8..af6b635e 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/IMGroupUser.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/IMGroupUser.java @@ -20,7 +20,7 @@ package com.cskefu.cc.model; import org.hibernate.annotations.GenericGenerator; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Date; @Entity diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/Instruction.java b/contact-center/app/src/main/java/com/cskefu/cc/model/Instruction.java index 6a717de3..f12d423c 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/Instruction.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/Instruction.java @@ -19,7 +19,7 @@ package com.cskefu.cc.model; import org.hibernate.annotations.GenericGenerator; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Date; @Entity diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/InviteRecord.java b/contact-center/app/src/main/java/com/cskefu/cc/model/InviteRecord.java index 0d536384..605d6f46 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/InviteRecord.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/InviteRecord.java @@ -20,7 +20,7 @@ package com.cskefu.cc.model; import com.cskefu.cc.basic.MainContext; import org.hibernate.annotations.GenericGenerator; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Date; @Entity diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/JobDetail.java b/contact-center/app/src/main/java/com/cskefu/cc/model/JobDetail.java index 2695904f..72d8da3a 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/JobDetail.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/JobDetail.java @@ -20,7 +20,7 @@ package com.cskefu.cc.model; import org.hibernate.annotations.GenericGenerator; -import javax.persistence.*; +import jakarta.persistence.*; import java.io.Serializable; import java.util.Date; diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/LeaveMsg.java b/contact-center/app/src/main/java/com/cskefu/cc/model/LeaveMsg.java index e8d9eb8c..dec115b3 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/LeaveMsg.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/LeaveMsg.java @@ -20,7 +20,7 @@ package com.cskefu.cc.model; import org.hibernate.annotations.GenericGenerator; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Date; @Entity diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/Media.java b/contact-center/app/src/main/java/com/cskefu/cc/model/Media.java index 2fda2ecf..fa0e05b6 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/Media.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/Media.java @@ -20,7 +20,7 @@ package com.cskefu.cc.model; import org.hibernate.annotations.GenericGenerator; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Date; @Entity diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/MetadataTable.java b/contact-center/app/src/main/java/com/cskefu/cc/model/MetadataTable.java index 42ee0e15..50b0cdc0 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/MetadataTable.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/MetadataTable.java @@ -21,7 +21,7 @@ package com.cskefu.cc.model; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Where; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Date; import java.util.List; diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/Organ.java b/contact-center/app/src/main/java/com/cskefu/cc/model/Organ.java index cbf9fca5..3f67a312 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/Organ.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/Organ.java @@ -19,7 +19,7 @@ package com.cskefu.cc.model; import org.hibernate.annotations.GenericGenerator; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Date; /** diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/OrganRole.java b/contact-center/app/src/main/java/com/cskefu/cc/model/OrganRole.java index b1cf53a5..1366d3ed 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/OrganRole.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/OrganRole.java @@ -19,7 +19,7 @@ package com.cskefu.cc.model; import org.hibernate.annotations.GenericGenerator; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Date; @Entity diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/OrganUser.java b/contact-center/app/src/main/java/com/cskefu/cc/model/OrganUser.java index c64587f8..9a3f4ea9 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/OrganUser.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/OrganUser.java @@ -12,10 +12,10 @@ package com.cskefu.cc.model; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.Table; import java.util.Date; /** diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/Organization.java b/contact-center/app/src/main/java/com/cskefu/cc/model/Organization.java index 6f27922b..d79873f3 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/Organization.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/Organization.java @@ -20,7 +20,7 @@ package com.cskefu.cc.model; import org.hibernate.annotations.GenericGenerator; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Date; diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/OrgiSkillRel.java b/contact-center/app/src/main/java/com/cskefu/cc/model/OrgiSkillRel.java index 3b11eb92..8e2a29a5 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/OrgiSkillRel.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/OrgiSkillRel.java @@ -19,7 +19,7 @@ package com.cskefu.cc.model; import org.hibernate.annotations.GenericGenerator; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Date; @Entity diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/PassportWebIMUser.java b/contact-center/app/src/main/java/com/cskefu/cc/model/PassportWebIMUser.java index 89937150..0a0a3e8e 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/PassportWebIMUser.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/PassportWebIMUser.java @@ -20,7 +20,7 @@ package com.cskefu.cc.model; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Proxy; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Date; @Entity diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/PassportWebIMUserHist.java b/contact-center/app/src/main/java/com/cskefu/cc/model/PassportWebIMUserHist.java index 5dfff11a..dd3360ae 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/PassportWebIMUserHist.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/PassportWebIMUserHist.java @@ -19,7 +19,7 @@ package com.cskefu.cc.model; import org.hibernate.annotations.GenericGenerator; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Date; @Entity diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/PassportWechatUser.java b/contact-center/app/src/main/java/com/cskefu/cc/model/PassportWechatUser.java index aaea92f2..f705e109 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/PassportWechatUser.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/PassportWechatUser.java @@ -19,7 +19,7 @@ package com.cskefu.cc.model; import org.apache.commons.lang3.StringUtils; import org.hibernate.annotations.GenericGenerator; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Date; @Entity diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/PbxHost.java b/contact-center/app/src/main/java/com/cskefu/cc/model/PbxHost.java index 53bbe21f..32e8eed8 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/PbxHost.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/PbxHost.java @@ -20,7 +20,7 @@ package com.cskefu.cc.model; import org.hibernate.annotations.GenericGenerator; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Date; @Entity diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/Product.java b/contact-center/app/src/main/java/com/cskefu/cc/model/Product.java index 5f900e69..6f6cc6a7 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/Product.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/Product.java @@ -19,7 +19,7 @@ package com.cskefu.cc.model; import org.hibernate.annotations.GenericGenerator; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Date; diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/PropertiesEvent.java b/contact-center/app/src/main/java/com/cskefu/cc/model/PropertiesEvent.java index 728124b6..48db42dd 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/PropertiesEvent.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/PropertiesEvent.java @@ -19,7 +19,7 @@ package com.cskefu.cc.model; import org.hibernate.annotations.GenericGenerator; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Date; @Entity diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/RecentUser.java b/contact-center/app/src/main/java/com/cskefu/cc/model/RecentUser.java index 96468760..c8d36a84 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/RecentUser.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/RecentUser.java @@ -18,7 +18,7 @@ package com.cskefu.cc.model; import org.hibernate.annotations.GenericGenerator; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Date; @Entity diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/ReportFilter.java b/contact-center/app/src/main/java/com/cskefu/cc/model/ReportFilter.java index fd74d1f8..9df55470 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/ReportFilter.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/ReportFilter.java @@ -23,7 +23,7 @@ import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Date; @Entity diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/ReportModel.java b/contact-center/app/src/main/java/com/cskefu/cc/model/ReportModel.java index 842d9d18..82813bc8 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/ReportModel.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/ReportModel.java @@ -23,7 +23,7 @@ import com.cskefu.cc.util.bi.ReportData; import org.apache.commons.codec.binary.Base64; import org.hibernate.annotations.GenericGenerator; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/Reporter.java b/contact-center/app/src/main/java/com/cskefu/cc/model/Reporter.java index f39c97d6..c840765a 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/Reporter.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/Reporter.java @@ -19,7 +19,7 @@ package com.cskefu.cc.model; import org.hibernate.annotations.GenericGenerator; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Date; import java.util.concurrent.atomic.AtomicInteger; diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/RequestLog.java b/contact-center/app/src/main/java/com/cskefu/cc/model/RequestLog.java index a149fd43..797dcca8 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/RequestLog.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/RequestLog.java @@ -19,7 +19,7 @@ package com.cskefu.cc.model; import org.hibernate.annotations.GenericGenerator; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Date; /** diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/Role.java b/contact-center/app/src/main/java/com/cskefu/cc/model/Role.java index c6ef0937..98676e0f 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/Role.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/Role.java @@ -18,7 +18,7 @@ package com.cskefu.cc.model; import org.hibernate.annotations.GenericGenerator; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Date; @Entity diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/RoleAuth.java b/contact-center/app/src/main/java/com/cskefu/cc/model/RoleAuth.java index 9609e3d9..95ad6d1a 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/RoleAuth.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/RoleAuth.java @@ -18,7 +18,7 @@ package com.cskefu.cc.model; import org.hibernate.annotations.GenericGenerator; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Date; @Entity diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/RouterRules.java b/contact-center/app/src/main/java/com/cskefu/cc/model/RouterRules.java index 116eeed0..909feeb9 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/RouterRules.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/RouterRules.java @@ -18,7 +18,7 @@ package com.cskefu.cc.model; import org.hibernate.annotations.GenericGenerator; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Date; @Entity diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/SaleStatus.java b/contact-center/app/src/main/java/com/cskefu/cc/model/SaleStatus.java index d1a90517..42fa7c8d 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/SaleStatus.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/SaleStatus.java @@ -18,7 +18,7 @@ package com.cskefu.cc.model; import org.hibernate.annotations.GenericGenerator; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Date; diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/Secret.java b/contact-center/app/src/main/java/com/cskefu/cc/model/Secret.java index 067d8326..56d2729d 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/Secret.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/Secret.java @@ -19,7 +19,7 @@ package com.cskefu.cc.model; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Proxy; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Date; @Entity diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/ServiceAi.java b/contact-center/app/src/main/java/com/cskefu/cc/model/ServiceAi.java index 75a70cbb..fdb126ee 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/ServiceAi.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/ServiceAi.java @@ -19,7 +19,7 @@ package com.cskefu.cc.model; import com.cskefu.cc.basic.MainUtils; import org.hibernate.annotations.GenericGenerator; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Date; @Entity diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/SessionConfig.java b/contact-center/app/src/main/java/com/cskefu/cc/model/SessionConfig.java index c1761520..55ee243a 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/SessionConfig.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/SessionConfig.java @@ -18,7 +18,7 @@ package com.cskefu.cc.model; import org.hibernate.annotations.GenericGenerator; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Date; @Entity diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/SipTrunk.java b/contact-center/app/src/main/java/com/cskefu/cc/model/SipTrunk.java index e091a01e..bcefd700 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/SipTrunk.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/SipTrunk.java @@ -18,7 +18,7 @@ package com.cskefu.cc.model; import org.hibernate.annotations.GenericGenerator; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Date; @Entity diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/StatusEvent.java b/contact-center/app/src/main/java/com/cskefu/cc/model/StatusEvent.java index ae4c5004..5e031540 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/StatusEvent.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/StatusEvent.java @@ -21,7 +21,7 @@ import com.cskefu.cc.basic.MainUtils; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Proxy; -import javax.persistence.*; +import jakarta.persistence.*; import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.Date; diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/StatusEventSatisf.java b/contact-center/app/src/main/java/com/cskefu/cc/model/StatusEventSatisf.java index c964a0fe..60b184b0 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/StatusEventSatisf.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/StatusEventSatisf.java @@ -19,7 +19,7 @@ package com.cskefu.cc.model; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Proxy; -import javax.persistence.*; +import jakarta.persistence.*; import java.io.Serializable; import java.util.Date; diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/StreamingFile.java b/contact-center/app/src/main/java/com/cskefu/cc/model/StreamingFile.java index 63b4cd27..56ab6c0c 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/StreamingFile.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/StreamingFile.java @@ -19,8 +19,8 @@ package com.cskefu.cc.model; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Proxy; -import javax.persistence.*; -import javax.validation.constraints.NotNull; +import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; import java.sql.Blob; @Entity diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/SysDic.java b/contact-center/app/src/main/java/com/cskefu/cc/model/SysDic.java index f4c8fc35..b5992671 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/SysDic.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/SysDic.java @@ -19,7 +19,7 @@ package com.cskefu.cc.model; import org.hibernate.annotations.GenericGenerator; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Date; @Entity diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/SystemConfig.java b/contact-center/app/src/main/java/com/cskefu/cc/model/SystemConfig.java index a96715ec..2df83c6a 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/SystemConfig.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/SystemConfig.java @@ -19,7 +19,7 @@ package com.cskefu.cc.model; import org.apache.commons.lang3.StringUtils; import org.hibernate.annotations.GenericGenerator; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Date; @Entity diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/SystemMessage.java b/contact-center/app/src/main/java/com/cskefu/cc/model/SystemMessage.java index 08101400..83452914 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/SystemMessage.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/SystemMessage.java @@ -19,7 +19,7 @@ package com.cskefu.cc.model; import org.hibernate.annotations.GenericGenerator; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Date; /** diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/TableProperties.java b/contact-center/app/src/main/java/com/cskefu/cc/model/TableProperties.java index 6d2191a6..2a8fc906 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/TableProperties.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/TableProperties.java @@ -19,7 +19,7 @@ package com.cskefu.cc.model; import org.hibernate.annotations.GenericGenerator; -import javax.persistence.*; +import jakarta.persistence.*; /** * @author jaddy0302 Rivulet TableProperties.java 2010-3-22 diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/Tag.java b/contact-center/app/src/main/java/com/cskefu/cc/model/Tag.java index 1bb10d8f..aba06ef8 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/Tag.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/Tag.java @@ -18,7 +18,7 @@ package com.cskefu.cc.model; import org.hibernate.annotations.GenericGenerator; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Date; @Entity diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/TagRelation.java b/contact-center/app/src/main/java/com/cskefu/cc/model/TagRelation.java index dffeb23b..9cd80f50 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/TagRelation.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/TagRelation.java @@ -19,7 +19,7 @@ package com.cskefu.cc.model; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Proxy; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name="uk_tagrelation") diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/Template.java b/contact-center/app/src/main/java/com/cskefu/cc/model/Template.java index 460ec80c..dece5adf 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/Template.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/Template.java @@ -18,7 +18,7 @@ package com.cskefu.cc.model; import org.hibernate.annotations.GenericGenerator; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Date; /** diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/UKefuCallOutFilter.java b/contact-center/app/src/main/java/com/cskefu/cc/model/UKefuCallOutFilter.java index 6f0d4b37..ea7b716e 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/UKefuCallOutFilter.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/UKefuCallOutFilter.java @@ -18,7 +18,7 @@ package com.cskefu.cc.model; import org.hibernate.annotations.GenericGenerator; -import javax.persistence.*; +import jakarta.persistence.*; import java.io.Serializable; import java.util.Date; diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/UKefuCallOutRole.java b/contact-center/app/src/main/java/com/cskefu/cc/model/UKefuCallOutRole.java index 6dba6df6..eb76d779 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/UKefuCallOutRole.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/UKefuCallOutRole.java @@ -18,7 +18,7 @@ package com.cskefu.cc.model; import org.hibernate.annotations.GenericGenerator; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Date; @Entity diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/UKefuCallOutTask.java b/contact-center/app/src/main/java/com/cskefu/cc/model/UKefuCallOutTask.java index cba62963..1c612b2c 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/UKefuCallOutTask.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/UKefuCallOutTask.java @@ -18,7 +18,7 @@ package com.cskefu.cc.model; import org.hibernate.annotations.GenericGenerator; -import javax.persistence.*; +import jakarta.persistence.*; import java.io.Serializable; import java.util.Date; diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/User.java b/contact-center/app/src/main/java/com/cskefu/cc/model/User.java index 377661ce..07a7db89 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/User.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/User.java @@ -19,7 +19,7 @@ package com.cskefu.cc.model; import org.hibernate.annotations.GenericGenerator; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.*; diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/UserHistory.java b/contact-center/app/src/main/java/com/cskefu/cc/model/UserHistory.java index 23afb45e..60e00773 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/UserHistory.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/UserHistory.java @@ -20,7 +20,7 @@ import com.cskefu.cc.basic.MainUtils; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Proxy; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Date; @Entity diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/UserRole.java b/contact-center/app/src/main/java/com/cskefu/cc/model/UserRole.java index 938d0a55..89304be7 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/UserRole.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/UserRole.java @@ -18,7 +18,7 @@ package com.cskefu.cc.model; import org.hibernate.annotations.GenericGenerator; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Date; @Entity diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/UserTraceHistory.java b/contact-center/app/src/main/java/com/cskefu/cc/model/UserTraceHistory.java index 558728ba..f44ea9b6 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/UserTraceHistory.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/UserTraceHistory.java @@ -19,7 +19,7 @@ package com.cskefu.cc.model; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Proxy; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Date; @Entity diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/WorkMonitor.java b/contact-center/app/src/main/java/com/cskefu/cc/model/WorkMonitor.java index b2858e03..9a69e993 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/WorkMonitor.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/WorkMonitor.java @@ -18,7 +18,7 @@ package com.cskefu.cc.model; import org.hibernate.annotations.GenericGenerator; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Date; /** diff --git a/contact-center/app/src/main/java/com/cskefu/cc/model/WorkSession.java b/contact-center/app/src/main/java/com/cskefu/cc/model/WorkSession.java index d48c79ec..da36035d 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/model/WorkSession.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/model/WorkSession.java @@ -19,7 +19,7 @@ package com.cskefu.cc.model; import org.hibernate.annotations.GenericGenerator; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Date; @Entity diff --git a/contact-center/app/src/main/java/com/cskefu/cc/peer/PeerSyncIM.java b/contact-center/app/src/main/java/com/cskefu/cc/peer/PeerSyncIM.java index ee96f121..7ad21c58 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/peer/PeerSyncIM.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/peer/PeerSyncIM.java @@ -38,7 +38,7 @@ import org.springframework.context.ApplicationContextAware; import org.springframework.context.annotation.Configuration; import org.springframework.stereotype.Component; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; /** * 客服与访客间消息处理类 diff --git a/contact-center/app/src/main/java/com/cskefu/cc/peer/im/ComposeMw1.java b/contact-center/app/src/main/java/com/cskefu/cc/peer/im/ComposeMw1.java index f0f0f90e..80f18af1 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/peer/im/ComposeMw1.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/peer/im/ComposeMw1.java @@ -87,7 +87,7 @@ public class ComposeMw1 implements Middleware { * @param ctx */ private void prcessAgentUserTask(final PeerContext ctx) { - AgentUserTask agentUserTask = agentUserTaskRes.getOne(ctx.getMessage().getAgentUser().getId()); + AgentUserTask agentUserTask = agentUserTaskRes.getReferenceById(ctx.getMessage().getAgentUser().getId()); if (agentUserTask != null) { final ChatMessage received = (ChatMessage) ctx.getMessage().getChannelMessage(); diff --git a/contact-center/app/src/main/java/com/cskefu/cc/persistence/blob/JpaBlobHelper.java b/contact-center/app/src/main/java/com/cskefu/cc/persistence/blob/JpaBlobHelper.java index fbef1453..cdb0cf6d 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/persistence/blob/JpaBlobHelper.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/persistence/blob/JpaBlobHelper.java @@ -21,7 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; diff --git a/contact-center/app/src/main/java/com/cskefu/cc/persistence/hibernate/BaseService.java b/contact-center/app/src/main/java/com/cskefu/cc/persistence/hibernate/BaseService.java index 6f9a4372..1b34fc76 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/persistence/hibernate/BaseService.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/persistence/hibernate/BaseService.java @@ -16,12 +16,17 @@ */ package com.cskefu.cc.persistence.hibernate; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; import org.hibernate.Session; import org.hibernate.SessionFactory; +import org.hibernate.cfg.Configuration; +import org.hibernate.query.Query; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import javax.persistence.EntityManagerFactory; +import java.util.ArrayList; import java.util.List; @Component @@ -113,11 +118,21 @@ public class BaseService { } @SuppressWarnings("unchecked") - public List list(final String bean) { - List dataList = null; - Session session = hibernateFactory.openSession(); + public List list(final String bean) { + List dataList = null; + Session session = new Configuration() + .configure() + .buildSessionFactory() + .openSession(); try { - dataList = session.createCriteria(Class.forName(bean)).list(); + dataList = new ArrayList<>(); + // TODO lecjy + Class clazz = Class.forName(bean); + CriteriaBuilder criteriaBuilder = session.getCriteriaBuilder(); + CriteriaQuery criteriaQuery = criteriaBuilder.createQuery(clazz); + criteriaQuery.from(clazz); + Query query = session.createQuery(criteriaQuery); + dataList = query.getResultList(); } catch (Exception ex) { ex.printStackTrace(); } finally { diff --git a/contact-center/app/src/main/java/com/cskefu/cc/persistence/impl/OrganDataExchangeImpl.java b/contact-center/app/src/main/java/com/cskefu/cc/persistence/impl/OrganDataExchangeImpl.java index 8c1b1cbb..c20a2f9e 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/persistence/impl/OrganDataExchangeImpl.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/persistence/impl/OrganDataExchangeImpl.java @@ -31,7 +31,7 @@ public class OrganDataExchangeImpl implements DataExchangeInterface { private OrganRepository organRes; public String getDataById(String id) { - Organ organ = organRes.findById(id); + Organ organ = organRes.getReferenceById(id); return organ != null ? organ.getName() : id; } diff --git a/contact-center/app/src/main/java/com/cskefu/cc/persistence/impl/ServiceDataExchangeImpl.java b/contact-center/app/src/main/java/com/cskefu/cc/persistence/impl/ServiceDataExchangeImpl.java index 79a3f70e..5ff9f5dc 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/persistence/impl/ServiceDataExchangeImpl.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/persistence/impl/ServiceDataExchangeImpl.java @@ -31,7 +31,7 @@ public class ServiceDataExchangeImpl implements DataExchangeInterface { private TagRepository tagRes; public String getDataById(String id) { - Tag tag = tagRes.findById(id); + Tag tag = tagRes.getReferenceById(id); return tag != null ? tag.getTag() : id; } diff --git a/contact-center/app/src/main/java/com/cskefu/cc/persistence/impl/TagDataExchangeImpl.java b/contact-center/app/src/main/java/com/cskefu/cc/persistence/impl/TagDataExchangeImpl.java index 4bbe22d9..01ef7012 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/persistence/impl/TagDataExchangeImpl.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/persistence/impl/TagDataExchangeImpl.java @@ -15,7 +15,7 @@ public class TagDataExchangeImpl implements DataExchangeInterface { private TagRepository tagRes; public String getDataById(String id) { - Tag tag = tagRes.findById(id); + Tag tag = tagRes.getReferenceById(id); return tag != null ? tag.getTag() : id; } diff --git a/contact-center/app/src/main/java/com/cskefu/cc/persistence/impl/UserDataExchangeImpl.java b/contact-center/app/src/main/java/com/cskefu/cc/persistence/impl/UserDataExchangeImpl.java index 4bf65c9d..4afb64b2 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/persistence/impl/UserDataExchangeImpl.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/persistence/impl/UserDataExchangeImpl.java @@ -31,7 +31,7 @@ public class UserDataExchangeImpl implements DataExchangeInterface { private UserRepository userRes; public String getDataById(String id) { - User user = userRes.findById(id); + User user = userRes.getReferenceById(id); return user != null ? user.getUsername() : id; } diff --git a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/AdTypeRepository.java b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/AdTypeRepository.java index 324cbb0a..0ab46db8 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/AdTypeRepository.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/AdTypeRepository.java @@ -23,8 +23,6 @@ import java.util.List; public interface AdTypeRepository extends JpaRepository { - AdType findById(String id); - AdType findByIdAndSkill(String id, String skill); int countByName(String name); diff --git a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/AgentReportRepository.java b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/AgentReportRepository.java index a3dc8863..d6a8b068 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/AgentReportRepository.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/AgentReportRepository.java @@ -21,9 +21,6 @@ import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; -public interface AgentReportRepository extends JpaRepository -{ - AgentReport findById(String id); - +public interface AgentReportRepository extends JpaRepository { List findAll(); } diff --git a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/AgentServiceRepository.java b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/AgentServiceRepository.java index d2d8db42..a3486c81 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/AgentServiceRepository.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/AgentServiceRepository.java @@ -29,14 +29,11 @@ import java.util.Optional; import java.util.Set; -public interface AgentServiceRepository - extends JpaRepository { - - AgentService findById(String paramString); +public interface AgentServiceRepository extends JpaRepository { List findByUseridOrderByLogindateDesc(String paramString); - @Query(value = "SELECT * FROM uk_agentservice WHERE userid= ?1 ORDER BY logindate DESC LIMIT 1", nativeQuery = true) + @Query(nativeQuery = true, value = "SELECT * FROM uk_agentservice WHERE userid= ?1 ORDER BY logindate DESC LIMIT 1") Optional findOneByUseridOrderByLogindateDesc(String userid); AgentService findFirstByUserid(String userid); diff --git a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/AgentStatusRepository.java b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/AgentStatusRepository.java index d036d9a0..456b5893 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/AgentStatusRepository.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/AgentStatusRepository.java @@ -25,11 +25,9 @@ import org.springframework.data.jpa.repository.Query; import java.util.List; import java.util.Optional; -public interface AgentStatusRepository extends - JpaRepository { - AgentStatus findById(String paramString); +public interface AgentStatusRepository extends JpaRepository { - @Query(value = "SELECT * FROM uk_agentstatus WHERE agentno = ?1 ORDER BY createtime DESC LIMIT 1", nativeQuery = true) + @Query(nativeQuery = true, value = "SELECT * FROM uk_agentstatus WHERE agentno = ?1 ORDER BY createtime DESC LIMIT 1") Optional findOneByAgentno(final String agentid); AgentStatus findByAgentno(String agentid); diff --git a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/AgentUserContactsRepository.java b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/AgentUserContactsRepository.java index 45aca82f..db554dee 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/AgentUserContactsRepository.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/AgentUserContactsRepository.java @@ -30,7 +30,7 @@ public interface AgentUserContactsRepository extends JpaRepository findOneByUserid(final String userid); /** @@ -38,6 +38,6 @@ public interface AgentUserContactsRepository extends JpaRepository findOneByContactsid(final String contactsid); } diff --git a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/AgentUserRepository.java b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/AgentUserRepository.java index 4b439e43..ab1b4ae9 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/AgentUserRepository.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/AgentUserRepository.java @@ -30,9 +30,8 @@ import java.util.Optional; import java.util.Set; public interface AgentUserRepository extends JpaRepository { - AgentUser findById(String paramString); - @Query(value = "SELECT * FROM uk_agentuser WHERE userid = ?1 ORDER BY createtime DESC LIMIT 1", nativeQuery = true) + @Query(nativeQuery = true, value = "SELECT * FROM uk_agentuser WHERE userid = ?1 ORDER BY createtime DESC LIMIT 1") Optional findOneByUserid(String userid); List findByUserid(String userid); @@ -72,29 +71,29 @@ public interface AgentUserRepository extends JpaRepository { AgentUser findOneByAgentnoAndStatus(String id, String status); - @Query(value = "SELECT * FROM uk_agentuser AS u " + + @Query(nativeQuery = true, value = "SELECT * FROM uk_agentuser AS u " + "LEFT JOIN uk_agentuser_contacts AS c " + - "ON u.userid = c.userid WHERE c.id = ?1 AND NOT u.status = ?2 LIMIT 1", nativeQuery = true) + "ON u.userid = c.userid WHERE c.id = ?1 AND NOT u.status = ?2 LIMIT 1") AgentUser findOneByContactIdAndStatusNot(final String contactid, final String status); - @Query(value = "SELECT * FROM uk_agentuser AS u " + + @Query(nativeQuery = true, value = "SELECT * FROM uk_agentuser AS u " + "LEFT JOIN uk_agentuser_contacts AS c " + "ON u.userid = c.userid WHERE c.contactsid = ?1 " + "AND c.channeltype = ?3 AND NOT u.status = ?2 " + - "ORDER BY u.createtime DESC LIMIT 1", nativeQuery = true) + "ORDER BY u.createtime DESC LIMIT 1") Optional findOneByContactIdAndStatusNotAndChanneltype(final String contactid, final String status, final String channeltype); - @Query(value = "SELECT * FROM uk_agentuser AS u " + + @Query(nativeQuery = true, value = "SELECT * FROM uk_agentuser AS u " + "LEFT JOIN uk_agentuser_contacts AS c " + "ON u.userid = c.userid WHERE c.contactsid = ?1 " + "AND c.channeltype = ?2 " + - "ORDER BY u.createtime DESC LIMIT 1", nativeQuery = true) + "ORDER BY u.createtime DESC LIMIT 1") Optional findOneByContactIdAndChanneltype(final String contactid, final String channeltype); - @Query(value = "SELECT * FROM uk_agentuser AS u " + + @Query(nativeQuery = true, value = "SELECT * FROM uk_agentuser AS u " + "WHERE u.userid = ?1 " + "AND u.channeltype = ?3 AND NOT u.status = ?2 " + - "ORDER BY u.createtime DESC LIMIT 1", nativeQuery = true) + "ORDER BY u.createtime DESC LIMIT 1") Optional findOneByUseridAndStatusNotAndChanneltype(final String userid, final String status, final String channeltype); AgentUser findOneByUseridAndStatusAndChanneltype(String userid, String status, String channeltype); diff --git a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/AgentUserTaskRepository.java b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/AgentUserTaskRepository.java index a788373a..ff9d8949 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/AgentUserTaskRepository.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/AgentUserTaskRepository.java @@ -23,9 +23,7 @@ import java.util.Date; import java.util.List; public interface AgentUserTaskRepository extends JpaRepository{ - - List findById(String id); - + List findByLastmessageLessThanAndStatus(Date start, String status) ; List findByLastgetmessageLessThanAndStatus(Date start, String status) ; diff --git a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/AreaTypeRepository.java b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/AreaTypeRepository.java index 8fbccf64..9370c072 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/AreaTypeRepository.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/AreaTypeRepository.java @@ -22,8 +22,6 @@ import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; public interface AreaTypeRepository extends JpaRepository { - - AreaType findById(String id); int countByName(String name); diff --git a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/AttachmentRepository.java b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/AttachmentRepository.java index f8a996f7..15286445 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/AttachmentRepository.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/AttachmentRepository.java @@ -25,8 +25,6 @@ import java.util.List; public interface AttachmentRepository extends JpaRepository { - AttachmentFile findById(String id); - List findByDataid(String dataid); List findByModelid(String modelid); diff --git a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/BlackListRepository.java b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/BlackListRepository.java index 4daf269b..317d774f 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/BlackListRepository.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/BlackListRepository.java @@ -27,8 +27,6 @@ import java.util.Set; public interface BlackListRepository extends JpaRepository { - BlackEntity findById(String id); - Optional findByUserid(String userid); Page findAll(Pageable page); diff --git a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/CallAgentRepository.java b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/CallAgentRepository.java index 5b7a7622..fb856375 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/CallAgentRepository.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/CallAgentRepository.java @@ -25,8 +25,6 @@ import java.util.List; public interface CallAgentRepository extends JpaRepository { - CallAgent findById(String id); - List findByName(String name); Page findAll(Pageable page); diff --git a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/CallCenterSkillRepository.java b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/CallCenterSkillRepository.java deleted file mode 100644 index 416d8c3d..00000000 --- a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/CallCenterSkillRepository.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (C) 2017 优客服-多渠道客服系统 - * Modifications copyright (C) 2018-2023 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.cskefu.cc.persistence.repository; - -import com.cskefu.cc.model.CallCenterSkill; -import org.springframework.data.jpa.repository.JpaRepository; - -import java.util.List; - -public interface CallCenterSkillRepository extends JpaRepository { - - CallCenterSkill findById(String id); - - List findByHostid(String hostid); - - int countBySkill(String skill); -} diff --git a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/ChannelRepository.java b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/ChannelRepository.java index 1df3f682..c50220d6 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/ChannelRepository.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/ChannelRepository.java @@ -28,14 +28,11 @@ import java.util.List; import java.util.Optional; @Repository -public interface ChannelRepository - extends JpaRepository { - - Channel findById(String id); +public interface ChannelRepository extends JpaRepository { boolean existsBySnsidAndType(String snsid, String type); - @Query(value = "SELECT * FROM `cs_channel` WHERE snsid = ?1 LIMIT 1", nativeQuery = true) + @Query(nativeQuery = true, value = "SELECT * FROM `cs_channel` WHERE snsid = ?1 LIMIT 1") Optional findBySnsid(String snsid); List findByBaseURL(String baseurl); @@ -48,14 +45,14 @@ public interface ChannelRepository Page findByType(String paramString, Pageable page); - @Query(value = "select s.* from `cs_channel` s WHERE s.type = ?1 and s.`organ` in (?2) ORDER BY ?#{#pageable}", - countQuery = "select count(1) from `cs_channel` s WHERE s.type = ?1 and s.`organ` in (?2)", nativeQuery = true) + @Query(nativeQuery = true, value = "select s.* from `cs_channel` s WHERE s.type = ?1 and s.`organ` in (?2) ORDER BY ?#{#pageable}", + countQuery = "select count(1) from `cs_channel` s WHERE s.type = ?1 and s.`organ` in (?2)") Page findByTypeAndOrgan(String type, Collection organ, Pageable page); - @Query(value = "SELECT * FROM cs_channel WHERE type = ?1 AND snsid = ?2 LIMIT 1", nativeQuery = true) + @Query(nativeQuery = true, value = "SELECT * FROM cs_channel WHERE type = ?1 AND snsid = ?2 LIMIT 1") Optional findOneBySnsTypeAndSnsId(final String type, final String snsId); - @Query(value = "SELECT * FROM cs_channel WHERE type = ?1 LIMIT 1", nativeQuery = true) + @Query(nativeQuery = true, value = "SELECT * FROM cs_channel WHERE type = ?1 LIMIT 1") Channel findOneByType(final String type); diff --git a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/ChatMessageRepository.java b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/ChatMessageRepository.java index 2e195aa2..af770ca5 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/ChatMessageRepository.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/ChatMessageRepository.java @@ -26,25 +26,22 @@ import org.springframework.data.repository.query.Param; import java.util.Date; import java.util.List; -public interface ChatMessageRepository - extends JpaRepository { - - ChatMessage findById(String id); +public interface ChatMessageRepository extends JpaRepository { Page findByUsession(String usession, Pageable page); - @Query(value = "select * from (select * from uk_chat_message where usession = :usession and createtime <= :createtime order by createtime desc limit 0,10 )t3" + + @Query(nativeQuery = true, value = "select * from (select * from uk_chat_message where usession = :usession and createtime <= :createtime order by createtime desc limit 0,10 )t3" + " UNION " + - "select * from (select * from uk_chat_message where usession = :usession and createtime > :createtime order by createtime limit 0,9999)t4 ORDER BY createtime", nativeQuery = true) + "select * from (select * from uk_chat_message where usession = :usession and createtime > :createtime order by createtime limit 0,9999)t4 ORDER BY createtime") List findByCreatetime(@Param("usession") String usession, @Param("createtime") Date createtime); - @Query(value = "select u from ChatMessage u where u.usession = ?1 and u.message like %?2% and u.islabel = true") + @Query("select u from ChatMessage u where u.usession = ?1 and u.message like %?2% and u.islabel = true") Page findByislabel(String usession, String message, Pageable page); - @Query(value = "select u from ChatMessage u where u.usession = ?1 and u.message like %?2%") + @Query("select u from ChatMessage u where u.usession = ?1 and u.message like %?2%") Page findByUsessionAndMessageContaining(String usession, String message, Pageable page); - @Query(value = "select * from(select * from uk_chat_message where usession = ?1 order by createtime desc limit ?2,20 ) c order by createtime asc", nativeQuery = true) + @Query(nativeQuery = true, value = "select * from(select * from uk_chat_message where usession = ?1 order by createtime desc limit ?2,20 ) c order by createtime asc") List findByusession(String usession, Integer current); int countByUsessionAndCreatetimeGreaterThanEqual(String usession, Date createtime); diff --git a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/ChatbotRepository.java b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/ChatbotRepository.java index ade612d8..222c9a62 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/ChatbotRepository.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/ChatbotRepository.java @@ -29,11 +29,10 @@ public interface ChatbotRepository extends JpaRepository { boolean existsBySnsAccountIdentifier(String snsid); - List findById(String id); Chatbot findBySnsAccountIdentifier(String snsid); - @Query(value = "select c from Chatbot c") + @Query("select c from Chatbot c") Page findWithPagination(Pageable pageRequest); List findAll(); diff --git a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/ConsultInviteRepository.java b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/ConsultInviteRepository.java index 9f9264b6..8efb2ee3 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/ConsultInviteRepository.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/ConsultInviteRepository.java @@ -24,12 +24,11 @@ import org.springframework.data.repository.query.Param; import java.util.Collection; import java.util.List; -public interface ConsultInviteRepository - extends JpaRepository { - @Query(value = "SELECT * from uk_consult_invite WHERE snsaccountid = ?1 LIMIT 1", nativeQuery = true) +public interface ConsultInviteRepository extends JpaRepository { + @Query(nativeQuery = true, value = "SELECT * from uk_consult_invite WHERE snsaccountid = ?1 LIMIT 1") CousultInvite findBySnsaccountid(@Param("snsaccountid") String Snsaccountid); - @Query(value = "select ci.`snsaccountid` from `uk_consult_invite` ci where ci.`consult_skill_fixed_id` in (?1)", nativeQuery = true) + @Query(nativeQuery = true, value = "select ci.`snsaccountid` from `uk_consult_invite` ci where ci.`consult_skill_fixed_id` in (?1)") List findSNSIdBySkill(Collection skills); List findAll(); diff --git a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/ContactsRepository.java b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/ContactsRepository.java index 34431774..1aa38f24 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/ContactsRepository.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/ContactsRepository.java @@ -39,7 +39,7 @@ public interface ContactsRepository extends JpaRepository { Contacts findByIdAndDatastatus(String id, Boolean datastatus); - @Query(value = "SELECT * FROM uk_contacts WHERE id = ?1", nativeQuery = true) + @Query(nativeQuery = true, value = "SELECT * FROM uk_contacts WHERE id = ?1") Optional findOneById(final String id); Page findByCreaterAndSharesAndDatastatus(String id, String shares, boolean datastatus, Pageable pageRequest); @@ -52,7 +52,7 @@ public interface ContactsRepository extends JpaRepository { * @param pageRequest * @return */ - @Query(value = "select c from Contacts c where c.organ IN :organs AND c.shares = 'all' AND c.datastatus = false") + @Query("select c from Contacts c where c.organ IN :organs AND c.shares = 'all' AND c.datastatus = false") Page findByOrganInAndSharesAllAndDatastatusFalse(@Param("organs") Collection organs, Pageable pageRequest); Page findByDatastatus(boolean b, Pageable pageRequest); diff --git a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/DataSourceService.java b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/DataSourceService.java index 7a1f95ea..425a61d7 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/DataSourceService.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/DataSourceService.java @@ -16,17 +16,18 @@ */ package com.cskefu.cc.persistence.repository; -import com.alibaba.druid.pool.DruidDataSource; import mondrian.olap.Connection; import mondrian.olap.DriverManager; import mondrian.olap.Util; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.sql.DataSource; + @Service public class DataSourceService { @Autowired - private DruidDataSource dataSource; + private DataSource dataSource; /** * @param xml diff --git a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/ExtensionRepository.java b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/ExtensionRepository.java index c614ddfd..806ddda1 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/ExtensionRepository.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/ExtensionRepository.java @@ -25,8 +25,6 @@ import java.util.Optional; public interface ExtensionRepository extends JpaRepository { - Extension findById(String id); - List findByHostid(String hostid); List findByExtension(String extension); @@ -37,11 +35,11 @@ public interface ExtensionRepository extends JpaRepository { List findByExtype(String type); - @Query(value = "SELECT * FROM uk_callcenter_extention WHERE extention = ?1 AND hostid = ?2 LIMIT 1", nativeQuery = true) + @Query(nativeQuery = true, value = "SELECT * FROM uk_callcenter_extention WHERE extention = ?1 AND hostid = ?2 LIMIT 1") Optional findOneByExtensionAndHostid(final String extension, final String hostid); int countByHostid(final String hostid); - @Query(value = "SELECT * FROM uk_callcenter_extention WHERE agentno = ?1 LIMIT 1", nativeQuery = true) + @Query(nativeQuery = true, value = "SELECT * FROM uk_callcenter_extention WHERE agentno = ?1 LIMIT 1") Optional findByAgentno(final String agentno); } diff --git a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/FormFilterRepository.java b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/FormFilterRepository.java index cd06d96a..08a342d6 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/FormFilterRepository.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/FormFilterRepository.java @@ -26,8 +26,6 @@ import java.util.List; public interface FormFilterRepository extends JpaRepository { - FormFilter findById(String id); - List findByName(String name); Page findAll(Pageable page); diff --git a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/IMGroupRepository.java b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/IMGroupRepository.java index 5d151eb5..27a90131 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/IMGroupRepository.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/IMGroupRepository.java @@ -21,9 +21,7 @@ import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; -public interface IMGroupRepository extends - JpaRepository { - IMGroup findById(String id); +public interface IMGroupRepository extends JpaRepository { List findByCreater(String user); diff --git a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/IMGroupUserRepository.java b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/IMGroupUserRepository.java index 21b025c7..b2953a6a 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/IMGroupUserRepository.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/IMGroupUserRepository.java @@ -25,8 +25,6 @@ import java.util.List; public interface IMGroupUserRepository extends JpaRepository { - IMGroupUser findById(String id); - List findByImgroup(IMGroup imgroup); IMGroupUser findByImgroupAndUser(IMGroup imgroup, User user); diff --git a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/JobDetailRepository.java b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/JobDetailRepository.java index 0cb6e7df..ad9a07af 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/JobDetailRepository.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/JobDetailRepository.java @@ -26,8 +26,6 @@ import java.util.Date; import java.util.List; public interface JobDetailRepository extends JpaRepository { - - JobDetail findById(String id); Page findByTasktype(String tasktype, Pageable page) ; diff --git a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/LeaveMsgRepository.java b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/LeaveMsgRepository.java index 8b7f4b3a..705d7fda 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/LeaveMsgRepository.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/LeaveMsgRepository.java @@ -28,9 +28,8 @@ import java.util.Set; public interface LeaveMsgRepository extends JpaRepository { Page findAll(Pageable page); - @Query(value = "SELECT o.name as skill,m.* FROM uk_leavemsg m LEFT JOIN uk_organ o ON m.skill=o.id WHERE m.skill IN (?1) ORDER BY ?#{#pageable}", - countQuery = "SELECT count(*) FROM uk_leavemsg WHERE skill IN (?1) ORDER BY ?#{#pageable}", - nativeQuery = true) + @Query(nativeQuery = true, value = "SELECT o.name as skill,m.* FROM uk_leavemsg m LEFT JOIN uk_organ o ON m.skill=o.id WHERE m.skill IN (?1) ORDER BY ?#{#pageable}", + countQuery = "SELECT count(*) FROM uk_leavemsg WHERE skill IN (?1) ORDER BY ?#{#pageable}") Page findBySkill(Set skill, Pageable page); List findByMobile(String mobile); diff --git a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/MetadataRepository.java b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/MetadataRepository.java index 6dadf474..657938de 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/MetadataRepository.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/MetadataRepository.java @@ -24,7 +24,6 @@ import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; public interface MetadataRepository extends JpaRepository{ - MetadataTable findById(String id); MetadataTable findByTablename(String tablename); diff --git a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/OrganRepository.java b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/OrganRepository.java index 39eba7fd..c66096f9 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/OrganRepository.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/OrganRepository.java @@ -21,13 +21,12 @@ import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; +import java.util.Collection; import java.util.List; import java.util.Optional; import java.util.Set; -public interface OrganRepository - extends JpaRepository { - Organ findById(String paramString); +public interface OrganRepository extends JpaRepository { Page findAll(Pageable paramPageable); diff --git a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/OrganRoleRepository.java b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/OrganRoleRepository.java index 724a3739..1f38cc1e 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/OrganRoleRepository.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/OrganRoleRepository.java @@ -22,8 +22,7 @@ import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; -public interface OrganRoleRepository extends JpaRepository -{ +public interface OrganRoleRepository extends JpaRepository { List findAll(); diff --git a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/OrganUserRepository.java b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/OrganUserRepository.java index 5eaf30f5..0adeacbe 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/OrganUserRepository.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/OrganUserRepository.java @@ -40,7 +40,7 @@ public interface OrganUserRepository extends JpaRepository { @Modifying @Transactional - @Query(value = "DELETE FROM OrganUser o WHERE o.userid = :userid AND o.organ = :organ") + @Query("DELETE FROM OrganUser o WHERE o.userid = :userid AND o.organ = :organ") void deleteOrganUserByUseridAndOrgan(@Param("userid") final String userid, @Param("organ") final String organ); } diff --git a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/PassportWebIMUserHistRepository.java b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/PassportWebIMUserHistRepository.java index 81363386..4983612c 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/PassportWebIMUserHistRepository.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/PassportWebIMUserHistRepository.java @@ -24,12 +24,11 @@ import java.util.List; import java.util.Optional; public interface PassportWebIMUserHistRepository extends JpaRepository { - PassportWebIMUserHist findById(String paramString); List findByUserid(String userid); List findBySessionid(String sessionId); - @Query(value = "SELECT * FROM cs_passport_webim_user_his WHERE sessionid = ?1 ORDER BY createtime DESC LIMIT 1", nativeQuery = true) + @Query(nativeQuery = true, value = "SELECT * FROM cs_passport_webim_user_his WHERE sessionid = ?1 ORDER BY createtime DESC LIMIT 1") Optional findOneBySessionid(String sessionId); } diff --git a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/PassportWebIMUserRepository.java b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/PassportWebIMUserRepository.java index f906f933..e0756701 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/PassportWebIMUserRepository.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/PassportWebIMUserRepository.java @@ -29,7 +29,7 @@ import java.util.Optional; public interface PassportWebIMUserRepository extends JpaRepository { - @Query(value = "SELECT * FROM cs_passport_webim_user WHERE userid = ?1 ORDER BY createtime DESC LIMIT 1", nativeQuery = true) + @Query(nativeQuery = true, value = "SELECT * FROM cs_passport_webim_user WHERE userid = ?1 ORDER BY createtime DESC LIMIT 1") PassportWebIMUser findOneByUserid(final String userid); Page findByUserid(String userid, Pageable page); @@ -49,7 +49,7 @@ public interface PassportWebIMUserRepository extends JpaRepository ?2 and createtime < ?3 group by result") List findByAgentnoAndCreatetimeRange(String agentno, Date start, Date end); - @Query("select result, count(id) as records from InviteRecord where agentno = ?2 group by result") + @Query("select result, count(id) as records from InviteRecord where agentno = ?1 group by result") List findByUserid(String userid); @Query("select count(id) from AgentService where status = ?1 and agentno = ?2 and createtime > ?3 and createtime < ?4") @@ -76,6 +76,6 @@ public interface PassportWebIMUserRepository extends JpaRepository findBySkillForDistinctAgent(String skill, String userid); - @Query(value = "SELECT * FROM cs_passport_webim_user WHERE contactsid = ?1 AND channel = ?2 LIMIT 1", nativeQuery = true) + @Query(nativeQuery = true, value = "SELECT * FROM cs_passport_webim_user WHERE contactsid = ?1 AND channel = ?2 LIMIT 1") Optional findOneByContactidAndChannel(final String contactId, final String channel); } diff --git a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/PbxHostRepository.java b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/PbxHostRepository.java index bf2063ed..ed5a7d65 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/PbxHostRepository.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/PbxHostRepository.java @@ -25,13 +25,12 @@ import java.util.Optional; import java.util.Set; public interface PbxHostRepository extends JpaRepository { - Optional findById(final String id); List findAll(); List findByHostnameOrIpaddr(String hostname, String ip); - @Query(value = "SELECT * FROM uk_callcenter_pbxhost WHERE ipaddr = ?1 LIMIT 1", nativeQuery = true) + @Query(nativeQuery = true, value = "SELECT * FROM uk_callcenter_pbxhost WHERE ipaddr = ?1 LIMIT 1") Optional findByIpaddr(String ipaddr); List findByOrganIn(Set organs); diff --git a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/ReporterRepository.java b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/ReporterRepository.java index 6bb7c3fc..f75202ce 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/ReporterRepository.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/ReporterRepository.java @@ -26,7 +26,6 @@ public interface ReporterRepository extends JpaRepository { Page findAll(Pageable pageable); - Reporter findById(String id); Page findAll(Specification spec, Pageable page); } diff --git a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/RoleAuthRepository.java b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/RoleAuthRepository.java index f600fe83..52526507 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/RoleAuthRepository.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/RoleAuthRepository.java @@ -22,9 +22,7 @@ import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; -public interface RoleAuthRepository - extends JpaRepository { - RoleAuth findById(String id); +public interface RoleAuthRepository extends JpaRepository { List findByRoleid(String roleid); diff --git a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/RoleRepository.java b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/RoleRepository.java index 62dbae25..5190ffd6 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/RoleRepository.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/RoleRepository.java @@ -21,12 +21,10 @@ import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; -public interface RoleRepository - extends JpaRepository { +public interface RoleRepository extends JpaRepository { List findAll(); Role findByName(String name); - Role findById(String id); } diff --git a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/SaleStatusRepository.java b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/SaleStatusRepository.java index fcc13a53..885ee761 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/SaleStatusRepository.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/SaleStatusRepository.java @@ -23,8 +23,6 @@ import java.util.List; public interface SaleStatusRepository extends JpaRepository { - SaleStatus findById(String id); - List findAll(); List findByActivityid(String activityid); diff --git a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/ServiceAiRepository.java b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/ServiceAiRepository.java index 37f368e3..2042cf7a 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/ServiceAiRepository.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/ServiceAiRepository.java @@ -23,8 +23,6 @@ import java.util.List; public interface ServiceAiRepository extends JpaRepository { - ServiceAi findById(String id); - ServiceAi findByCode(String code); List findAll(); diff --git a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/ServiceSummaryRepository.java b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/ServiceSummaryRepository.java index 8e1f64c1..f5c32494 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/ServiceSummaryRepository.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/ServiceSummaryRepository.java @@ -30,8 +30,6 @@ public interface ServiceSummaryRepository extends JpaRepository findByAgentserviceid(String agentserviceid); - AgentServiceSummary findById(String id); - AgentServiceSummary findByStatuseventid(String statuseventid); Page findAll(Specification spec, Pageable pageable); //分页按条件查询 diff --git a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/SessionConfigRepository.java b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/SessionConfigRepository.java index 5a437d6d..a7df52f3 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/SessionConfigRepository.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/SessionConfigRepository.java @@ -22,7 +22,7 @@ import org.springframework.data.jpa.repository.Query; public interface SessionConfigRepository extends JpaRepository { - @Query(value = "SELECT * FROM `uk_sessionconfig` LIMIT 1", nativeQuery = true) + @Query(nativeQuery = true, value = "SELECT * FROM `uk_sessionconfig` LIMIT 1") SessionConfig findOne(); SessionConfig findBySkill(String skill); diff --git a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/SipTrunkRepository.java b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/SipTrunkRepository.java index 3a2e0a7f..32f53a40 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/SipTrunkRepository.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/SipTrunkRepository.java @@ -25,11 +25,9 @@ import java.util.Optional; public interface SipTrunkRepository extends JpaRepository { - SipTrunk findById(String id); - List findByHostid(String hostid); - @Query(value = "SELECT * FROM uk_callcenter_siptrunk WHERE hostid = ?1 AND name <> ?2 LIMIT 1", nativeQuery = true) + @Query(nativeQuery = true, value = "SELECT * FROM uk_callcenter_siptrunk WHERE hostid = ?1 AND name <> ?2 LIMIT 1") Optional findOneByHostidAndNameNot(final String hostid, final String name); int countByHostid(final String hostid); diff --git a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/StatusEventRepository.java b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/StatusEventRepository.java index 911039a9..8694d9d7 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/StatusEventRepository.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/StatusEventRepository.java @@ -29,8 +29,6 @@ import java.util.List; public interface StatusEventRepository extends JpaRepository { - StatusEvent findById(String id); - StatusEvent findByIdOrBridgeid(String id, String bridgeid); Page findByAni(String ani, Pageable page); @@ -61,7 +59,7 @@ public interface StatusEventRepository extends JpaRepository queryCalloutHangupAuditGroupByAgentAndDirection(String channel, String fromdate, @@ -101,7 +99,7 @@ public interface StatusEventRepository extends JpaRepository= :fromdate) " + "and (:enddate is null or s.createtime < :enddate) " + "and (:organid is null or s.organid = :organid) " + "and (:agent is null or s.agent = :agent) " + @@ -120,7 +118,7 @@ public interface StatusEventRepository extends JpaRepository queryCallOutHangupAggsGroupByDialplanByDatestrAndChannelAndDirection(String datestr, String channel, String direction); diff --git a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/SysDicRepository.java b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/SysDicRepository.java index 11aa778f..d071ac69 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/SysDicRepository.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/SysDicRepository.java @@ -24,10 +24,7 @@ import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; public interface SysDicRepository extends JpaRepository{ - - - SysDic findById(String id); - + SysDic findByCode(String code); Page findAll(Pageable paramPageable); diff --git a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/SystemConfigRepository.java b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/SystemConfigRepository.java index 7653a915..1b588dd2 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/SystemConfigRepository.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/SystemConfigRepository.java @@ -22,7 +22,7 @@ import org.springframework.data.jpa.repository.Query; public interface SystemConfigRepository extends JpaRepository { - @Query(value = "SELECT * FROM uk_systemconfig LIMIT 1", nativeQuery = true) + @Query(nativeQuery = true, value = "SELECT * FROM uk_systemconfig LIMIT 1") SystemConfig findOne(); } diff --git a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/SystemMessageRepository.java b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/SystemMessageRepository.java index 32302a04..209b0b36 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/SystemMessageRepository.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/SystemMessageRepository.java @@ -24,9 +24,7 @@ import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; public interface SystemMessageRepository extends JpaRepository{ - - SystemMessage findById(String id); - + Page findByMsgtype(String msgtype, Pageable paramPageable); List findByMsgtype(String msgtype); diff --git a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/TablePropertiesRepository.java b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/TablePropertiesRepository.java index e63d4cbc..2a242a62 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/TablePropertiesRepository.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/TablePropertiesRepository.java @@ -22,8 +22,6 @@ import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; public interface TablePropertiesRepository extends JpaRepository{ - - TableProperties findById(String id); List findByDbtableid(String dbtableid) ; diff --git a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/TagRepository.java b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/TagRepository.java index fb884644..2fbfbc53 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/TagRepository.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/TagRepository.java @@ -25,14 +25,12 @@ import org.springframework.data.repository.query.Param; import java.util.List; -public interface TagRepository extends JpaRepository -{ +public interface TagRepository extends JpaRepository { Tag findByTagAndSkill(String tag, String skill); - Tag findById(String id); - @Query(value = "select t from Tag t where :tagtype is null or t.tagtype = :tagtype") + @Query("select t from Tag t where :tagtype is null or t.tagtype = :tagtype") Page findByTagtype(@Param("tagtype") String tagtype, Pageable paramPageable); Page findByTagtypeAndSkill(String tagtype, String skill, Pageable paramPageable); diff --git a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/TemplateRepository.java b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/TemplateRepository.java index 87fc43e0..7b2ac300 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/TemplateRepository.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/TemplateRepository.java @@ -23,7 +23,6 @@ import java.util.List; public interface TemplateRepository extends JpaRepository { - Template findById(String id); List