Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
service-campaign
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Nguyen Ha
service-campaign
Commits
96185e71
Commit
96185e71
authored
Aug 09, 2019
by
Vu Duy Anh
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
anhvd commit multidatasource
parent
7e1d0f89
Changes
66
Hide whitespace changes
Inline
Side-by-side
Showing
66 changed files
with
437 additions
and
234 deletions
+437
-234
src/main/java/com/viettel/campaign/ServiceCampaignApplication.java
...java/com/viettel/campaign/ServiceCampaignApplication.java
+1
-1
src/main/java/com/viettel/campaign/config/ACDFullDatasourceConfig.java
.../com/viettel/campaign/config/ACDFullDatasourceConfig.java
+77
-0
src/main/java/com/viettel/campaign/config/CCMSFullDatasourceConfig.java
...com/viettel/campaign/config/CCMSFullDatasourceConfig.java
+79
-0
src/main/java/com/viettel/campaign/config/DataSourceQualify.java
...n/java/com/viettel/campaign/config/DataSourceQualify.java
+15
-0
src/main/java/com/viettel/campaign/config/JobConfig.java
src/main/java/com/viettel/campaign/config/JobConfig.java
+12
-10
src/main/java/com/viettel/campaign/config/OracleDataSource.java
...in/java/com/viettel/campaign/config/OracleDataSource.java
+24
-0
src/main/java/com/viettel/campaign/job/CampaignJob.java
src/main/java/com/viettel/campaign/job/CampaignJob.java
+2
-2
src/main/java/com/viettel/campaign/mapper/ApParamMapper.java
src/main/java/com/viettel/campaign/mapper/ApParamMapper.java
+1
-1
src/main/java/com/viettel/campaign/mapper/CampaignCompleteCodeMapper.java
...m/viettel/campaign/mapper/CampaignCompleteCodeMapper.java
+1
-1
src/main/java/com/viettel/campaign/mapper/CustomerListMapper.java
.../java/com/viettel/campaign/mapper/CustomerListMapper.java
+1
-1
src/main/java/com/viettel/campaign/mapper/CustomerMapper.java
...main/java/com/viettel/campaign/mapper/CustomerMapper.java
+1
-1
src/main/java/com/viettel/campaign/model/ccms_full/ApParam.java
...in/java/com/viettel/campaign/model/ccms_full/ApParam.java
+1
-1
src/main/java/com/viettel/campaign/model/ccms_full/Campaign.java
...n/java/com/viettel/campaign/model/ccms_full/Campaign.java
+1
-1
src/main/java/com/viettel/campaign/model/ccms_full/CampaignAgent.java
...a/com/viettel/campaign/model/ccms_full/CampaignAgent.java
+1
-1
src/main/java/com/viettel/campaign/model/ccms_full/CampaignCompleteCode.java
...iettel/campaign/model/ccms_full/CampaignCompleteCode.java
+1
-1
src/main/java/com/viettel/campaign/model/ccms_full/CampaignCustomer.java
...om/viettel/campaign/model/ccms_full/CampaignCustomer.java
+1
-1
src/main/java/com/viettel/campaign/model/ccms_full/CampaignCustomerList.java
...iettel/campaign/model/ccms_full/CampaignCustomerList.java
+1
-1
src/main/java/com/viettel/campaign/model/ccms_full/Customer.java
...n/java/com/viettel/campaign/model/ccms_full/Customer.java
+1
-1
src/main/java/com/viettel/campaign/model/ccms_full/CustomerContact.java
...com/viettel/campaign/model/ccms_full/CustomerContact.java
+1
-1
src/main/java/com/viettel/campaign/model/ccms_full/CustomerList.java
...va/com/viettel/campaign/model/ccms_full/CustomerList.java
+1
-1
src/main/java/com/viettel/campaign/model/ccms_full/CustomerListMapping.java
...viettel/campaign/model/ccms_full/CustomerListMapping.java
+1
-1
src/main/java/com/viettel/campaign/model/ccms_full/ProcessConfig.java
...a/com/viettel/campaign/model/ccms_full/ProcessConfig.java
+1
-1
src/main/java/com/viettel/campaign/model/ccms_full/Ticket.java
...ain/java/com/viettel/campaign/model/ccms_full/Ticket.java
+1
-1
src/main/java/com/viettel/campaign/model/ccms_full/TicketCatStatus.java
...com/viettel/campaign/model/ccms_full/TicketCatStatus.java
+1
-1
src/main/java/com/viettel/campaign/model/ccms_full/TicketSite.java
...java/com/viettel/campaign/model/ccms_full/TicketSite.java
+1
-1
src/main/java/com/viettel/campaign/model/ccms_full/TimeRangeDialMode.java
...m/viettel/campaign/model/ccms_full/TimeRangeDialMode.java
+1
-1
src/main/java/com/viettel/campaign/model/ccms_full/TimeZoneDialMode.java
...om/viettel/campaign/model/ccms_full/TimeZoneDialMode.java
+1
-1
src/main/java/com/viettel/campaign/repository/CampaignCompleteCodeRepositoryCustom.java
...aign/repository/CampaignCompleteCodeRepositoryCustom.java
+0
-12
src/main/java/com/viettel/campaign/repository/ccms_full/ApParamRepository.java
...ttel/campaign/repository/ccms_full/ApParamRepository.java
+2
-2
src/main/java/com/viettel/campaign/repository/ccms_full/ApParamRepositoryCustom.java
...ampaign/repository/ccms_full/ApParamRepositoryCustom.java
+1
-1
src/main/java/com/viettel/campaign/repository/ccms_full/BaseRepository.java
...viettel/campaign/repository/ccms_full/BaseRepository.java
+1
-1
src/main/java/com/viettel/campaign/repository/ccms_full/CampaignCompleteCodeRepository.java
.../repository/ccms_full/CampaignCompleteCodeRepository.java
+3
-3
src/main/java/com/viettel/campaign/repository/ccms_full/CampaignCompleteCodeRepositoryCustom.java
...itory/ccms_full/CampaignCompleteCodeRepositoryCustom.java
+12
-0
src/main/java/com/viettel/campaign/repository/ccms_full/CampaignCustomerListRepository.java
.../repository/ccms_full/CampaignCustomerListRepository.java
+2
-2
src/main/java/com/viettel/campaign/repository/ccms_full/CampaignCustomerRepository.java
...aign/repository/ccms_full/CampaignCustomerRepository.java
+2
-2
src/main/java/com/viettel/campaign/repository/ccms_full/CampaignExecuteRepository.java
...paign/repository/ccms_full/CampaignExecuteRepository.java
+1
-1
src/main/java/com/viettel/campaign/repository/ccms_full/CampaignRepository.java
...tel/campaign/repository/ccms_full/CampaignRepository.java
+2
-5
src/main/java/com/viettel/campaign/repository/ccms_full/CampaignRepositoryCustom.java
...mpaign/repository/ccms_full/CampaignRepositoryCustom.java
+1
-1
src/main/java/com/viettel/campaign/repository/ccms_full/CustomerContactRepository.java
...paign/repository/ccms_full/CustomerContactRepository.java
+2
-2
src/main/java/com/viettel/campaign/repository/ccms_full/CustomerListMappingRepository.java
...n/repository/ccms_full/CustomerListMappingRepository.java
+2
-2
src/main/java/com/viettel/campaign/repository/ccms_full/CustomerListRepository.java
...campaign/repository/ccms_full/CustomerListRepository.java
+2
-2
src/main/java/com/viettel/campaign/repository/ccms_full/CustomerRepository.java
...tel/campaign/repository/ccms_full/CustomerRepository.java
+2
-2
src/main/java/com/viettel/campaign/repository/ccms_full/ProcessConfigRepository.java
...ampaign/repository/ccms_full/ProcessConfigRepository.java
+2
-2
src/main/java/com/viettel/campaign/repository/ccms_full/TicketRepository.java
...ettel/campaign/repository/ccms_full/TicketRepository.java
+6
-0
src/main/java/com/viettel/campaign/repository/ccms_full/TicketRepositoryCustom.java
...campaign/repository/ccms_full/TicketRepositoryCustom.java
+1
-1
src/main/java/com/viettel/campaign/repository/ccms_full/TimeRangeDialModeRepository.java
...ign/repository/ccms_full/TimeRangeDialModeRepository.java
+2
-2
src/main/java/com/viettel/campaign/repository/ccms_full/TimeZoneDialModeRepository.java
...aign/repository/ccms_full/TimeZoneDialModeRepository.java
+2
-2
src/main/java/com/viettel/campaign/repository/ccms_full/UserActionLogRepositoryCustom.java
...n/repository/ccms_full/UserActionLogRepositoryCustom.java
+1
-1
src/main/java/com/viettel/campaign/repository/ccms_full/impl/AppParamRepositoryImpl.java
...ign/repository/ccms_full/impl/AppParamRepositoryImpl.java
+2
-2
src/main/java/com/viettel/campaign/repository/ccms_full/impl/CampaignCompleteCompleteCodeRepositoryIpml.java
...full/impl/CampaignCompleteCompleteCodeRepositoryIpml.java
+11
-8
src/main/java/com/viettel/campaign/repository/ccms_full/impl/CampaignExecuteRepositoryImp.java
...pository/ccms_full/impl/CampaignExecuteRepositoryImp.java
+26
-84
src/main/java/com/viettel/campaign/repository/ccms_full/impl/CampaignRepositoryImpl.java
...ign/repository/ccms_full/impl/CampaignRepositoryImpl.java
+5
-2
src/main/java/com/viettel/campaign/repository/ccms_full/impl/TicketRepositoryImpl.java
...paign/repository/ccms_full/impl/TicketRepositoryImpl.java
+5
-2
src/main/java/com/viettel/campaign/repository/ccms_full/impl/UserActionLogRepositoryImpl.java
...epository/ccms_full/impl/UserActionLogRepositoryImpl.java
+2
-2
src/main/java/com/viettel/campaign/service/ApParamService.java
...ain/java/com/viettel/campaign/service/ApParamService.java
+1
-1
src/main/java/com/viettel/campaign/service/CampaignService.java
...in/java/com/viettel/campaign/service/CampaignService.java
+1
-2
src/main/java/com/viettel/campaign/service/CustomerService.java
...in/java/com/viettel/campaign/service/CustomerService.java
+1
-4
src/main/java/com/viettel/campaign/service/ProcessConfigService.java
...va/com/viettel/campaign/service/ProcessConfigService.java
+2
-2
src/main/java/com/viettel/campaign/service/impl/ApParamServiceImpl.java
...com/viettel/campaign/service/impl/ApParamServiceImpl.java
+9
-2
src/main/java/com/viettel/campaign/service/impl/CampaignCompleteCodeServiceImpl.java
...ampaign/service/impl/CampaignCompleteCodeServiceImpl.java
+15
-5
src/main/java/com/viettel/campaign/service/impl/CampaignExecuteServiceImp.java
...ttel/campaign/service/impl/CampaignExecuteServiceImp.java
+21
-17
src/main/java/com/viettel/campaign/service/impl/CampaignServiceImpl.java
...om/viettel/campaign/service/impl/CampaignServiceImpl.java
+21
-10
src/main/java/com/viettel/campaign/service/impl/CustomerServiceImpl.java
...om/viettel/campaign/service/impl/CustomerServiceImpl.java
+23
-9
src/main/java/com/viettel/campaign/service/impl/TicketServiceImpl.java
.../com/viettel/campaign/service/impl/TicketServiceImpl.java
+5
-2
src/main/java/com/viettel/campaign/web/rest/ApParamController.java
...java/com/viettel/campaign/web/rest/ApParamController.java
+1
-1
src/main/resources/application.yml
src/main/resources/application.yml
+7
-0
No files found.
src/main/java/com/viettel/campaign/ServiceCampaignApplication.java
View file @
96185e71
...
@@ -3,7 +3,7 @@ package com.viettel.campaign;
...
@@ -3,7 +3,7 @@ package com.viettel.campaign;
import
org.springframework.boot.SpringApplication
;
import
org.springframework.boot.SpringApplication
;
import
org.springframework.boot.autoconfigure.SpringBootApplication
;
import
org.springframework.boot.autoconfigure.SpringBootApplication
;
@SpringBootApplication
@SpringBootApplication
(
scanBasePackages
={
"com.viettel.campaign"
})
public
class
ServiceCampaignApplication
{
public
class
ServiceCampaignApplication
{
public
static
void
main
(
String
[]
args
)
{
public
static
void
main
(
String
[]
args
)
{
...
...
src/main/java/com/viettel/campaign/config/ACDFullDatasourceConfig.java
0 → 100644
View file @
96185e71
package
com.viettel.campaign.config
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Qualifier
;
import
org.springframework.context.annotation.*
;
import
org.springframework.core.env.Environment
;
import
org.springframework.data.jpa.repository.config.EnableJpaRepositories
;
import
org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate
;
import
org.springframework.orm.jpa.JpaTransactionManager
;
import
org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean
;
import
org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter
;
import
org.springframework.transaction.PlatformTransactionManager
;
import
javax.sql.DataSource
;
import
java.util.HashMap
;
/**
* @author anhvd_itsol
*/
@Configuration
@PropertySource
({
"classpath:application.yml"
})
@EnableJpaRepositories
(
basePackages
=
"com.viettel.campaign.repository.acd_full"
,
entityManagerFactoryRef
=
"acdFullEntityManager"
,
transactionManagerRef
=
DataSourceQualify
.
ACD_FULL
)
public
class
ACDFullDatasourceConfig
{
@Autowired
private
Environment
env
;
@Bean
(
"datasource2.datasource"
)
public
DataSource
dataSource
(){
OracleDataSource
r
=
new
OracleDataSource
();
r
.
setDriverClassName
(
env
.
getProperty
(
"spring.datasource2.driver-class-name"
));
r
.
setPoolName
(
"app.datasource2"
);
r
.
setJdbcUrl
(
env
.
getProperty
(
"spring.datasource2.url"
));
r
.
setMaximumPoolSize
(
env
.
getProperty
(
"spring.datasource2.max_pool_size"
,
Integer
.
class
));
r
.
setPassword
(
env
.
getProperty
(
"spring.datasource2.password"
));
r
.
setUsername
(
env
.
getProperty
(
"spring.datasource2.username"
));
return
r
;
}
@Bean
public
LocalContainerEntityManagerFactoryBean
acdFullEntityManager
()
{
LocalContainerEntityManagerFactoryBean
em2
=
new
LocalContainerEntityManagerFactoryBean
();
em2
.
setDataSource
(
dataSource
());
em2
.
setPackagesToScan
(
new
String
[]
{
"com.viettel.campaign.model.acd_full"
});
em2
.
setPersistenceUnitName
(
DataSourceQualify
.
JPA_UNIT_NAME_ACD_FULL
);
// Important !!
HibernateJpaVendorAdapter
vendorAdapter
=
new
HibernateJpaVendorAdapter
();
em2
.
setJpaVendorAdapter
(
vendorAdapter
);
HashMap
<
String
,
Object
>
properties
=
new
HashMap
<>();
properties
.
put
(
"hibernate.dialect"
,
env
.
getProperty
(
"spring.jpa.database-platform"
));
em2
.
setJpaPropertyMap
(
properties
);
return
em2
;
}
@Bean
(
name
=
DataSourceQualify
.
ACD_FULL
)
public
PlatformTransactionManager
acdFullTransactionManager
()
{
JpaTransactionManager
transactionManager
=
new
JpaTransactionManager
();
transactionManager
.
setEntityManagerFactory
(
acdFullEntityManager
().
getObject
());
return
transactionManager
;
}
@Bean
(
name
=
DataSourceQualify
.
NAMED_JDBC_PARAMETER_TEMPLATE_ACD_FULL
)
@DependsOn
(
"datasource2.datasource"
)
public
NamedParameterJdbcTemplate
namedParameterJdbcTemplate
(
@Qualifier
(
"datasource2.datasource"
)
DataSource
abcDataSource
)
{
return
new
NamedParameterJdbcTemplate
(
abcDataSource
);
}
}
src/main/java/com/viettel/campaign/config/CCMSFullDatasourceConfig.java
0 → 100644
View file @
96185e71
package
com.viettel.campaign.config
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Qualifier
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.context.annotation.DependsOn
;
import
org.springframework.context.annotation.PropertySource
;
import
org.springframework.core.env.Environment
;
import
org.springframework.data.jpa.repository.config.EnableJpaRepositories
;
import
org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate
;
import
org.springframework.orm.jpa.JpaTransactionManager
;
import
org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean
;
import
org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter
;
import
org.springframework.transaction.PlatformTransactionManager
;
import
javax.sql.DataSource
;
import
java.util.HashMap
;
/**
* @author anhvd_itsol
*/
@Configuration
@PropertySource
({
"classpath:application.yml"
})
@EnableJpaRepositories
(
basePackages
=
"com.viettel.campaign.repository.ccms_full"
,
entityManagerFactoryRef
=
"ccmsFullEntityManager"
,
transactionManagerRef
=
DataSourceQualify
.
CCMS_FULL
)
public
class
CCMSFullDatasourceConfig
{
@Autowired
private
Environment
env
;
@Bean
(
"datasource1.datasource"
)
public
DataSource
dataSource
(){
OracleDataSource
r
=
new
OracleDataSource
();
r
.
setDriverClassName
(
env
.
getProperty
(
"spring.datasource.driver-class-name"
));
r
.
setPoolName
(
"app.datasource1"
);
r
.
setJdbcUrl
(
env
.
getProperty
(
"spring.datasource.url"
));
r
.
setMaximumPoolSize
(
env
.
getProperty
(
"spring.datasource.max_pool_size"
,
Integer
.
class
));
r
.
setPassword
(
env
.
getProperty
(
"spring.datasource.password"
));
r
.
setUsername
(
env
.
getProperty
(
"spring.datasource.username"
));
return
r
;
}
@Bean
public
LocalContainerEntityManagerFactoryBean
ccmsFullEntityManager
()
{
LocalContainerEntityManagerFactoryBean
em
=
new
LocalContainerEntityManagerFactoryBean
();
em
.
setDataSource
(
dataSource
());
em
.
setPackagesToScan
(
new
String
[]
{
"com.viettel.campaign.model.ccms_full"
});
em
.
setPersistenceUnitName
(
DataSourceQualify
.
JPA_UNIT_NAME_CCMS_FULL
);
// Important !!
HibernateJpaVendorAdapter
vendorAdapter
=
new
HibernateJpaVendorAdapter
();
em
.
setJpaVendorAdapter
(
vendorAdapter
);
HashMap
<
String
,
Object
>
properties
=
new
HashMap
<>();
properties
.
put
(
"hibernate.dialect"
,
env
.
getProperty
(
"spring.jpa.database-platform"
));
em
.
setJpaPropertyMap
(
properties
);
return
em
;
}
@Bean
(
name
=
DataSourceQualify
.
CCMS_FULL
)
public
PlatformTransactionManager
ccmsFullTransactionManager
()
{
JpaTransactionManager
transactionManager
=
new
JpaTransactionManager
();
transactionManager
.
setEntityManagerFactory
(
ccmsFullEntityManager
().
getObject
());
return
transactionManager
;
}
@Bean
(
name
=
DataSourceQualify
.
NAMED_JDBC_PARAMETER_TEMPLATE_CCMS_FULL
)
@DependsOn
(
"datasource1.datasource"
)
public
NamedParameterJdbcTemplate
namedParameterJdbcTemplate
(
@Qualifier
(
"datasource1.datasource"
)
DataSource
abcDataSource
)
{
return
new
NamedParameterJdbcTemplate
(
abcDataSource
);
}
}
src/main/java/com/viettel/campaign/config/DataSourceQualify.java
0 → 100644
View file @
96185e71
package
com.viettel.campaign.config
;
/**
* @author anhvd_itsol
*/
public
class
DataSourceQualify
{
public
static
final
String
CCMS_FULL
=
"ccmsFullTransactionManager"
;
public
static
final
String
ACD_FULL
=
"acdFullTransactionManager"
;
public
static
final
String
JPA_UNIT_NAME_CCMS_FULL
=
"PERSITENCE_UNIT_NAME_1"
;
public
static
final
String
JPA_UNIT_NAME_ACD_FULL
=
"PERSITENCE_UNIT_NAME_2"
;
public
static
final
String
NAMED_JDBC_PARAMETER_TEMPLATE_CCMS_FULL
=
"NAMED_JDBC_PARAMETER_TEMPLATE_CCMS_FULL"
;
public
static
final
String
NAMED_JDBC_PARAMETER_TEMPLATE_ACD_FULL
=
"NAMED_JDBC_PARAMETER_TEMPLATE_ACD_FULL"
;
}
src/main/java/com/viettel/campaign/config/JobConfig.java
View file @
96185e71
...
@@ -4,6 +4,7 @@ import com.viettel.campaign.job.CampaignJob;
...
@@ -4,6 +4,7 @@ import com.viettel.campaign.job.CampaignJob;
import
com.viettel.campaign.service.ApParamService
;
import
com.viettel.campaign.service.ApParamService
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Qualifier
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.scheduling.TaskScheduler
;
import
org.springframework.scheduling.TaskScheduler
;
...
@@ -14,6 +15,7 @@ import org.springframework.scheduling.annotation.SchedulingConfigurer;
...
@@ -14,6 +15,7 @@ import org.springframework.scheduling.annotation.SchedulingConfigurer;
import
org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler
;
import
org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler
;
import
org.springframework.scheduling.config.ScheduledTaskRegistrar
;
import
org.springframework.scheduling.config.ScheduledTaskRegistrar
;
import
org.springframework.scheduling.support.CronTrigger
;
import
org.springframework.scheduling.support.CronTrigger
;
import
org.springframework.transaction.annotation.Transactional
;
import
java.util.Date
;
import
java.util.Date
;
import
java.util.concurrent.ScheduledFuture
;
import
java.util.concurrent.ScheduledFuture
;
...
@@ -83,15 +85,15 @@ public class JobConfig implements SchedulingConfigurer {
...
@@ -83,15 +85,15 @@ public class JobConfig implements SchedulingConfigurer {
@Override
@Override
public
void
configureTasks
(
ScheduledTaskRegistrar
scheduledTaskRegistrar
)
{
public
void
configureTasks
(
ScheduledTaskRegistrar
scheduledTaskRegistrar
)
{
ThreadPoolTaskScheduler
threadPoolTaskScheduler
=
new
ThreadPoolTaskScheduler
();
//
ThreadPoolTaskScheduler threadPoolTaskScheduler = new ThreadPoolTaskScheduler();
threadPoolTaskScheduler
.
setPoolSize
(
10
);
//
threadPoolTaskScheduler.setPoolSize(10);
threadPoolTaskScheduler
.
setThreadNamePrefix
(
"scheduler-thread"
);
//
threadPoolTaskScheduler.setThreadNamePrefix("scheduler-thread");
threadPoolTaskScheduler
.
initialize
();
//
threadPoolTaskScheduler.initialize();
scheduledTaskRegistrar
.
setTaskScheduler
(
threadPoolTaskScheduler
);
//
scheduledTaskRegistrar.setTaskScheduler(threadPoolTaskScheduler);
// scheduledTaskRegistrar.addTriggerTask(() -> campaignJob().process(), (TriggerContext triggerContext) -> yourService.getCron());
//
//
scheduledTaskRegistrar.addTriggerTask(() -> campaignJob().process(), (TriggerContext triggerContext) -> yourService.getCron());
scheduledTaskRegistrar
.
addTriggerTask
(()
->
campaignJob
().
process
(),
triggerContext
->
{
//
scheduledTaskRegistrar.addTriggerTask(() -> campaignJob().process(), triggerContext -> {
CronTrigger
trigger
=
new
CronTrigger
(
"0/5 * * * * ?"
);
//
CronTrigger trigger = new CronTrigger("0/5 * * * * ?");
return
trigger
.
nextExecutionTime
(
triggerContext
);
//
return trigger.nextExecutionTime(triggerContext);
});
//
});
}
}
}
}
src/main/java/com/viettel/campaign/config/OracleDataSource.java
0 → 100644
View file @
96185e71
package
com.viettel.campaign.config
;
import
com.zaxxer.hikari.HikariDataSource
;
/**
* @author anhvd_itsol
*/
public
class
OracleDataSource
extends
HikariDataSource
{
public
OracleDataSource
(){
super
.
addDataSourceProperty
(
"useSSL"
,
"false"
);
super
.
addDataSourceProperty
(
"cachePrepStmts"
,
"true"
);
super
.
addDataSourceProperty
(
"prepStmtCacheSize"
,
"256"
);
super
.
addDataSourceProperty
(
"allowMultiQueries"
,
"true"
);
super
.
addDataSourceProperty
(
"useServerPrepStmts"
,
"false"
);
super
.
addDataSourceProperty
(
"useLocalSessionState"
,
"true"
);
super
.
addDataSourceProperty
(
"prepStmtCacheSqlLimit"
,
"81920"
);
super
.
addDataSourceProperty
(
"nullCatalogMeansCurrent"
,
"true"
);
super
.
addDataSourceProperty
(
"rewriteBatchedStatements"
,
"false"
);
super
.
addDataSourceProperty
(
"useOldAliasMetadataBehavior"
,
"true"
);
this
.
setIdleTimeout
(
600000
);
this
.
setConnectionTimeout
(
18000
);
this
.
setMinimumIdle
(
0
);
this
.
setMaxLifetime
(
1800000
);
this
.
setInitializationFailTimeout
(
0
);
}
}
src/main/java/com/viettel/campaign/job/CampaignJob.java
View file @
96185e71
package
com.viettel.campaign.job
;
package
com.viettel.campaign.job
;
import
com.viettel.campaign.model.Campaign
;
import
com.viettel.campaign.model.
ccms_full.
Campaign
;
import
com.viettel.campaign.model.ProcessConfig
;
import
com.viettel.campaign.model.
ccms_full.
ProcessConfig
;
import
com.viettel.campaign.service.CampaignService
;
import
com.viettel.campaign.service.CampaignService
;
import
com.viettel.campaign.service.ProcessConfigService
;
import
com.viettel.campaign.service.ProcessConfigService
;
import
com.viettel.campaign.utils.DateTimeUtil
;
import
com.viettel.campaign.utils.DateTimeUtil
;
...
...
src/main/java/com/viettel/campaign/mapper/ApParamMapper.java
View file @
96185e71
package
com.viettel.campaign.mapper
;
package
com.viettel.campaign.mapper
;
import
com.viettel.campaign.web.dto.ApParamDTO
;
import
com.viettel.campaign.web.dto.ApParamDTO
;
import
com.viettel.campaign.model.ApParam
;
import
com.viettel.campaign.model.
ccms_full.
ApParam
;
public
class
ApParamMapper
extends
BaseMapper
<
ApParam
,
ApParamDTO
>
{
public
class
ApParamMapper
extends
BaseMapper
<
ApParam
,
ApParamDTO
>
{
...
...
src/main/java/com/viettel/campaign/mapper/CampaignCompleteCodeMapper.java
View file @
96185e71
package
com.viettel.campaign.mapper
;
package
com.viettel.campaign.mapper
;
import
com.viettel.campaign.web.dto.CampaignCompleteCodeDTO
;
import
com.viettel.campaign.web.dto.CampaignCompleteCodeDTO
;
import
com.viettel.campaign.model.CampaignCompleteCode
;
import
com.viettel.campaign.model.
ccms_full.
CampaignCompleteCode
;
public
class
CampaignCompleteCodeMapper
extends
BaseMapper
<
CampaignCompleteCode
,
CampaignCompleteCodeDTO
>
{
public
class
CampaignCompleteCodeMapper
extends
BaseMapper
<
CampaignCompleteCode
,
CampaignCompleteCodeDTO
>
{
...
...
src/main/java/com/viettel/campaign/mapper/CustomerListMapper.java
View file @
96185e71
package
com.viettel.campaign.mapper
;
package
com.viettel.campaign.mapper
;
import
com.viettel.campaign.model.CustomerList
;
import
com.viettel.campaign.model.
ccms_full.
CustomerList
;
import
com.viettel.campaign.web.dto.CustomerListDTO
;
import
com.viettel.campaign.web.dto.CustomerListDTO
;
public
class
CustomerListMapper
extends
BaseMapper
<
CustomerList
,
CustomerListDTO
>
{
public
class
CustomerListMapper
extends
BaseMapper
<
CustomerList
,
CustomerListDTO
>
{
...
...
src/main/java/com/viettel/campaign/mapper/CustomerMapper.java
View file @
96185e71
package
com.viettel.campaign.mapper
;
package
com.viettel.campaign.mapper
;
import
com.viettel.campaign.web.dto.CustomerDTO
;
import
com.viettel.campaign.web.dto.CustomerDTO
;
import
com.viettel.campaign.model.Customer
;
import
com.viettel.campaign.model.
ccms_full.
Customer
;
public
class
CustomerMapper
extends
BaseMapper
<
Customer
,
CustomerDTO
>
{
public
class
CustomerMapper
extends
BaseMapper
<
Customer
,
CustomerDTO
>
{
...
...
src/main/java/com/viettel/campaign/model/ApParam.java
→
src/main/java/com/viettel/campaign/model/
ccms_full/
ApParam.java
View file @
96185e71
package
com.viettel.campaign.model
;
package
com.viettel.campaign.model
.ccms_full
;
import
lombok.Getter
;
import
lombok.Getter
;
import
lombok.Setter
;
import
lombok.Setter
;
...
...
src/main/java/com/viettel/campaign/model/Campaign.java
→
src/main/java/com/viettel/campaign/model/
ccms_full/
Campaign.java
View file @
96185e71
package
com.viettel.campaign.model
;
package
com.viettel.campaign.model
.ccms_full
;
import
lombok.Getter
;
import
lombok.Getter
;
import
lombok.Setter
;
import
lombok.Setter
;
...
...
src/main/java/com/viettel/campaign/model/CampaignAgent.java
→
src/main/java/com/viettel/campaign/model/
ccms_full/
CampaignAgent.java
View file @
96185e71
package
com.viettel.campaign.model
;
package
com.viettel.campaign.model
.ccms_full
;
import
lombok.Getter
;
import
lombok.Getter
;
import
lombok.Setter
;
import
lombok.Setter
;
...
...
src/main/java/com/viettel/campaign/model/CampaignCompleteCode.java
→
src/main/java/com/viettel/campaign/model/
ccms_full/
CampaignCompleteCode.java
View file @
96185e71
package
com.viettel.campaign.model
;
package
com.viettel.campaign.model
.ccms_full
;
import
lombok.Getter
;
import
lombok.Getter
;
import
lombok.Setter
;
import
lombok.Setter
;
...
...
src/main/java/com/viettel/campaign/model/CampaignCustomer.java
→
src/main/java/com/viettel/campaign/model/
ccms_full/
CampaignCustomer.java
View file @
96185e71
package
com.viettel.campaign.model
;
package
com.viettel.campaign.model
.ccms_full
;
import
lombok.Getter
;
import
lombok.Getter
;
import
lombok.Setter
;
import
lombok.Setter
;
...
...
src/main/java/com/viettel/campaign/model/CampaignCustomerList.java
→
src/main/java/com/viettel/campaign/model/
ccms_full/
CampaignCustomerList.java
View file @
96185e71
package
com.viettel.campaign.model
;
package
com.viettel.campaign.model
.ccms_full
;
import
lombok.Getter
;
import
lombok.Getter
;
import
lombok.Setter
;
import
lombok.Setter
;
...
...
src/main/java/com/viettel/campaign/model/Customer.java
→
src/main/java/com/viettel/campaign/model/
ccms_full/
Customer.java
View file @
96185e71
package
com.viettel.campaign.model
;
package
com.viettel.campaign.model
.ccms_full
;
import
lombok.Getter
;
import
lombok.Getter
;
import
lombok.Setter
;
import
lombok.Setter
;
...
...
src/main/java/com/viettel/campaign/model/CustomerContact.java
→
src/main/java/com/viettel/campaign/model/
ccms_full/
CustomerContact.java
View file @
96185e71
package
com.viettel.campaign.model
;
package
com.viettel.campaign.model
.ccms_full
;
import
lombok.Getter
;
import
lombok.Getter
;
import
lombok.Setter
;
import
lombok.Setter
;
...
...
src/main/java/com/viettel/campaign/model/CustomerList.java
→
src/main/java/com/viettel/campaign/model/
ccms_full/
CustomerList.java
View file @
96185e71
package
com.viettel.campaign.model
;
package
com.viettel.campaign.model
.ccms_full
;
import
lombok.Getter
;
import
lombok.Getter
;
import
lombok.Setter
;
import
lombok.Setter
;
...
...
src/main/java/com/viettel/campaign/model/CustomerListMapping.java
→
src/main/java/com/viettel/campaign/model/
ccms_full/
CustomerListMapping.java
View file @
96185e71
package
com.viettel.campaign.model
;
package
com.viettel.campaign.model
.ccms_full
;
import
lombok.Getter
;
import
lombok.Getter
;
import
lombok.Setter
;
import
lombok.Setter
;
...
...
src/main/java/com/viettel/campaign/model/ProcessConfig.java
→
src/main/java/com/viettel/campaign/model/
ccms_full/
ProcessConfig.java
View file @
96185e71
package
com.viettel.campaign.model
;
package
com.viettel.campaign.model
.ccms_full
;
import
lombok.Data
;
import
lombok.Data
;
...
...
src/main/java/com/viettel/campaign/model/Ticket.java
→
src/main/java/com/viettel/campaign/model/
ccms_full/
Ticket.java
View file @
96185e71
package
com.viettel.campaign.model
;
package
com.viettel.campaign.model
.ccms_full
;
import
lombok.Getter
;
import
lombok.Getter
;
import
lombok.Setter
;
import
lombok.Setter
;
...
...
src/main/java/com/viettel/campaign/model/TicketCatStatus.java
→
src/main/java/com/viettel/campaign/model/
ccms_full/
TicketCatStatus.java
View file @
96185e71
package
com.viettel.campaign.model
;
package
com.viettel.campaign.model
.ccms_full
;
import
lombok.Getter
;
import
lombok.Getter
;
import
lombok.Setter
;
import
lombok.Setter
;
...
...
src/main/java/com/viettel/campaign/model/TicketSite.java
→
src/main/java/com/viettel/campaign/model/
ccms_full/
TicketSite.java
View file @
96185e71
package
com.viettel.campaign.model
;
package
com.viettel.campaign.model
.ccms_full
;
import
lombok.Getter
;
import
lombok.Getter
;
import
lombok.Setter
;
import
lombok.Setter
;
...
...
src/main/java/com/viettel/campaign/model/TimeRangeDialMode.java
→
src/main/java/com/viettel/campaign/model/
ccms_full/
TimeRangeDialMode.java
View file @
96185e71
package
com.viettel.campaign.model
;
package
com.viettel.campaign.model
.ccms_full
;
import
lombok.Getter
;
import
lombok.Getter
;
import
lombok.Setter
;
import
lombok.Setter
;
...
...
src/main/java/com/viettel/campaign/model/TimeZoneDialMode.java
→
src/main/java/com/viettel/campaign/model/
ccms_full/
TimeZoneDialMode.java
View file @
96185e71
package
com.viettel.campaign.model
;
package
com.viettel.campaign.model
.ccms_full
;
import
javax.persistence.Entity
;
import
javax.persistence.Entity
;
import
lombok.Getter
;
import
lombok.Getter
;
...
...
src/main/java/com/viettel/campaign/repository/CampaignCompleteCodeRepositoryCustom.java
deleted
100644 → 0
View file @
7e1d0f89
package
com.viettel.campaign.repository
;
import
com.viettel.campaign.model.CampaignCompleteCode
;
public
interface
CampaignCompleteCodeRepositoryCustom
{
// CampaignCompleteCode updateStatusById(Long id);
// CampaignCompleteCode findMaxValueCampaignType(Long companySiteId);
}
src/main/java/com/viettel/campaign/repository/ApParamRepository.java
→
src/main/java/com/viettel/campaign/repository/
ccms_full/
ApParamRepository.java
View file @
96185e71
package
com.viettel.campaign.repository
;
package
com.viettel.campaign.repository
.ccms_full
;
import
com.viettel.campaign.model.ApParam
;
import
com.viettel.campaign.model.
ccms_full.
ApParam
;
import
org.springframework.data.domain.Page
;
import
org.springframework.data.domain.Page
;
import
org.springframework.data.domain.Pageable
;
import
org.springframework.data.domain.Pageable
;
import
org.springframework.data.jpa.repository.JpaRepository
;
import
org.springframework.data.jpa.repository.JpaRepository
;
...
...
src/main/java/com/viettel/campaign/repository/ApParamRepositoryCustom.java
→
src/main/java/com/viettel/campaign/repository/
ccms_full/
ApParamRepositoryCustom.java
View file @
96185e71
package
com.viettel.campaign.repository
;
package
com.viettel.campaign.repository
.ccms_full
;
import
org.springframework.stereotype.Repository
;
import
org.springframework.stereotype.Repository
;
...
...
src/main/java/com/viettel/campaign/repository/BaseRepository.java
→
src/main/java/com/viettel/campaign/repository/
ccms_full/
BaseRepository.java
View file @
96185e71
package
com.viettel.campaign.repository
;
package
com.viettel.campaign.repository
.ccms_full
;
import
org.springframework.data.jpa.repository.JpaRepository
;
import
org.springframework.data.jpa.repository.JpaRepository
;
import
org.springframework.data.jpa.repository.JpaSpecificationExecutor
;
import
org.springframework.data.jpa.repository.JpaSpecificationExecutor
;
...
...
src/main/java/com/viettel/campaign/repository/CampaignCompleteCodeRepository.java
→
src/main/java/com/viettel/campaign/repository/
ccms_full/
CampaignCompleteCodeRepository.java
View file @
96185e71
package
com.viettel.campaign.repository
;
package
com.viettel.campaign.repository
.ccms_full
;
import
com.viettel.campaign.model.CampaignCompleteCode
;
import
com.viettel.campaign.model.
ccms_full.
CampaignCompleteCode
;
import
org.springframework.data.domain.Page
;
import
org.springframework.data.domain.Page
;
import
org.springframework.data.domain.Pageable
;
import
org.springframework.data.domain.Pageable
;
import
org.springframework.data.jpa.repository.JpaRepository
;
import
org.springframework.data.jpa.repository.JpaRepository
;
...
@@ -12,7 +12,7 @@ import org.springframework.stereotype.Repository;
...
@@ -12,7 +12,7 @@ import org.springframework.stereotype.Repository;
import
java.util.List
;
import
java.util.List
;
@Repository
@Repository
public
interface
CampaignCompleteCodeRepository
extends
JpaRepository
<
CampaignCompleteCode
,
Long
>
,
CampaignCompleteCodeRepositoryCustom
{
public
interface
CampaignCompleteCodeRepository
extends
JpaRepository
<
CampaignCompleteCode
,
Long
>{
@Query
(
" select u FROM CampaignCompleteCode u WHERE u.status = 1"
)
@Query
(
" select u FROM CampaignCompleteCode u WHERE u.status = 1"
)
Page
<
CampaignCompleteCode
>
findAll
(
Pageable
pageable
);
Page
<
CampaignCompleteCode
>
findAll
(
Pageable
pageable
);
...
...
src/main/java/com/viettel/campaign/repository/ccms_full/CampaignCompleteCodeRepositoryCustom.java
0 → 100644
View file @
96185e71
package
com.viettel.campaign.repository.ccms_full
;
import
com.viettel.campaign.model.ccms_full.CampaignCompleteCode
;
public
interface
CampaignCompleteCodeRepositoryCustom
{
CampaignCompleteCode
updateStatusById
(
Long
id
);
CampaignCompleteCode
findMaxValueCampaignType
(
Long
companySiteId
);
}
src/main/java/com/viettel/campaign/repository/CampaignCustomerListRepository.java
→
src/main/java/com/viettel/campaign/repository/
ccms_full/
CampaignCustomerListRepository.java
View file @
96185e71
package
com.viettel.campaign.repository
;
package
com.viettel.campaign.repository
.ccms_full
;
import
com.viettel.campaign.model.CampaignCustomerList
;
import
com.viettel.campaign.model.
ccms_full.
CampaignCustomerList
;
import
org.springframework.data.jpa.repository.JpaRepository
;
import
org.springframework.data.jpa.repository.JpaRepository
;
import
org.springframework.data.jpa.repository.Query
;
import
org.springframework.data.jpa.repository.Query
;
import
org.springframework.data.repository.query.Param
;
import
org.springframework.data.repository.query.Param
;
...
...
src/main/java/com/viettel/campaign/repository/CampaignCustomerRepository.java
→
src/main/java/com/viettel/campaign/repository/
ccms_full/
CampaignCustomerRepository.java
View file @
96185e71
package
com.viettel.campaign.repository
;
package
com.viettel.campaign.repository
.ccms_full
;
import
com.viettel.campaign.model.CampaignCustomer
;
import
com.viettel.campaign.model.
ccms_full.
CampaignCustomer
;
import
org.springframework.data.jpa.repository.JpaRepository
;
import
org.springframework.data.jpa.repository.JpaRepository
;
import
org.springframework.data.jpa.repository.Query
;
import
org.springframework.data.jpa.repository.Query
;
import
org.springframework.data.repository.query.Param
;
import
org.springframework.data.repository.query.Param
;
...
...
src/main/java/com/viettel/campaign/repository/CampaignExecuteRepository.java
→
src/main/java/com/viettel/campaign/repository/
ccms_full/
CampaignExecuteRepository.java
View file @
96185e71
package
com.viettel.campaign.repository
;
package
com.viettel.campaign.repository
.ccms_full
;
import
com.viettel.campaign.web.dto.ApParamDTO
;
import
com.viettel.campaign.web.dto.ApParamDTO
;
import
com.viettel.campaign.web.dto.ContactCustResultDTO
;
import
com.viettel.campaign.web.dto.ContactCustResultDTO
;
...
...
src/main/java/com/viettel/campaign/repository/CampaignRepository.java
→
src/main/java/com/viettel/campaign/repository/
ccms_full/
CampaignRepository.java
View file @
96185e71
package
com.viettel.campaign.repository
;
package
com.viettel.campaign.repository
.ccms_full
;
import
com.viettel.campaign.model.Campaign
;
import
com.viettel.campaign.model.ccms_full.Campaign
;
import
com.viettel.campaign.web.dto.CampaignDTO
;
import
com.viettel.campaign.web.dto.ResultDTO
;
import
org.springframework.data.jpa.repository.JpaRepository
;
import
org.springframework.data.jpa.repository.JpaRepository
;
import
org.springframework.data.jpa.repository.Query
;
import
org.springframework.data.jpa.repository.Query
;
import
org.springframework.data.repository.query.Param
;
import
org.springframework.data.repository.query.Param
;
import
org.springframework.stereotype.Repository
;
import
org.springframework.stereotype.Repository
;
import
java.math.BigDecimal
;
import
java.util.Date
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.List
;
...
...
src/main/java/com/viettel/campaign/repository/CampaignRepositoryCustom.java
→
src/main/java/com/viettel/campaign/repository/
ccms_full/
CampaignRepositoryCustom.java
View file @
96185e71
package
com.viettel.campaign.repository
;
package
com.viettel.campaign.repository
.ccms_full
;
import
com.viettel.campaign.web.dto.ResultDTO
;
import
com.viettel.campaign.web.dto.ResultDTO
;
import
com.viettel.campaign.web.dto.request_dto.CampaignRequestDTO
;
import
com.viettel.campaign.web.dto.request_dto.CampaignRequestDTO
;
...
...
src/main/java/com/viettel/campaign/repository/CustomerContactRepository.java
→
src/main/java/com/viettel/campaign/repository/
ccms_full/
CustomerContactRepository.java
View file @
96185e71
package
com.viettel.campaign.repository
;
package
com.viettel.campaign.repository
.ccms_full
;
import
com.viettel.campaign.model.CustomerContact
;
import
com.viettel.campaign.model.
ccms_full.
CustomerContact
;
import
org.springframework.data.domain.Pageable
;
import
org.springframework.data.domain.Pageable
;
import
org.springframework.data.jpa.repository.JpaRepository
;
import
org.springframework.data.jpa.repository.JpaRepository
;
import
org.springframework.data.jpa.repository.Query
;
import
org.springframework.data.jpa.repository.Query
;
...
...
src/main/java/com/viettel/campaign/repository/CustomerListMappingRepository.java
→
src/main/java/com/viettel/campaign/repository/
ccms_full/
CustomerListMappingRepository.java
View file @
96185e71
package
com.viettel.campaign.repository
;
package
com.viettel.campaign.repository
.ccms_full
;
import
com.viettel.campaign.model.CustomerListMapping
;
import
com.viettel.campaign.model.
ccms_full.
CustomerListMapping
;
import
org.springframework.data.jpa.repository.JpaRepository
;
import
org.springframework.data.jpa.repository.JpaRepository
;
import
org.springframework.data.jpa.repository.Modifying
;
import
org.springframework.data.jpa.repository.Modifying
;
import
org.springframework.data.jpa.repository.Query
;
import
org.springframework.data.jpa.repository.Query
;
...
...
src/main/java/com/viettel/campaign/repository/CustomerListRepository.java
→
src/main/java/com/viettel/campaign/repository/
ccms_full/
CustomerListRepository.java
View file @
96185e71
package
com.viettel.campaign.repository
;
package
com.viettel.campaign.repository
.ccms_full
;
import
com.viettel.campaign.model.CustomerList
;
import
com.viettel.campaign.model.
ccms_full.
CustomerList
;
import
org.springframework.data.jpa.repository.JpaRepository
;
import
org.springframework.data.jpa.repository.JpaRepository
;
import
org.springframework.data.jpa.repository.Modifying
;
import
org.springframework.data.jpa.repository.Modifying
;
import
org.springframework.data.jpa.repository.Query
;
import
org.springframework.data.jpa.repository.Query
;
...
...
src/main/java/com/viettel/campaign/repository/CustomerRepository.java
→
src/main/java/com/viettel/campaign/repository/
ccms_full/
CustomerRepository.java
View file @
96185e71
package
com.viettel.campaign.repository
;
package
com.viettel.campaign.repository
.ccms_full
;
import
com.viettel.campaign.model.Customer
;
import
com.viettel.campaign.model.
ccms_full.
Customer
;
import
org.springframework.data.domain.Page
;
import
org.springframework.data.domain.Page
;
import
org.springframework.data.domain.Pageable
;
import
org.springframework.data.domain.Pageable
;
import
org.springframework.data.jpa.repository.JpaRepository
;
import
org.springframework.data.jpa.repository.JpaRepository
;
...
...
src/main/java/com/viettel/campaign/repository/ProcessConfigRepository.java
→
src/main/java/com/viettel/campaign/repository/
ccms_full/
ProcessConfigRepository.java
View file @
96185e71
package
com.viettel.campaign.repository
;
package
com.viettel.campaign.repository
.ccms_full
;
import
com.viettel.campaign.model.ProcessConfig
;
import
com.viettel.campaign.model.
ccms_full.
ProcessConfig
;
import
org.springframework.data.jpa.repository.JpaRepository
;
import
org.springframework.data.jpa.repository.JpaRepository
;
import
org.springframework.stereotype.Repository
;
import
org.springframework.stereotype.Repository
;
...
...
src/main/java/com/viettel/campaign/repository/TicketRepository.java
→
src/main/java/com/viettel/campaign/repository/
ccms_full/
TicketRepository.java
View file @
96185e71
package
com.viettel.campaign.repository
;
package
com.viettel.campaign.repository
.ccms_full
;
import
com.viettel.campaign.model.Ticket
;
import
com.viettel.campaign.model.
ccms_full.
Ticket
;
public
interface
TicketRepository
extends
BaseRepository
<
Ticket
>,
TicketRepositoryCustom
{
public
interface
TicketRepository
extends
BaseRepository
<
Ticket
>,
TicketRepositoryCustom
{
}
}
src/main/java/com/viettel/campaign/repository/TicketRepositoryCustom.java
→
src/main/java/com/viettel/campaign/repository/
ccms_full/
TicketRepositoryCustom.java
View file @
96185e71
package
com.viettel.campaign.repository
;
package
com.viettel.campaign.repository
.ccms_full
;
import
com.viettel.campaign.web.dto.TicketDTO
;
import
com.viettel.campaign.web.dto.TicketDTO
;
import
org.springframework.data.domain.Pageable
;
import
org.springframework.data.domain.Pageable
;
...
...
src/main/java/com/viettel/campaign/repository/TimeRangeDialModeRepository.java
→
src/main/java/com/viettel/campaign/repository/
ccms_full/
TimeRangeDialModeRepository.java
View file @
96185e71
package
com.viettel.campaign.repository
;
package
com.viettel.campaign.repository
.ccms_full
;
import
com.viettel.campaign.model.TimeRangeDialMode
;
import
com.viettel.campaign.model.
ccms_full.
TimeRangeDialMode
;
import
org.springframework.data.jpa.repository.JpaRepository
;
import
org.springframework.data.jpa.repository.JpaRepository
;
import
org.springframework.stereotype.Repository
;
import
org.springframework.stereotype.Repository
;
...
...
src/main/java/com/viettel/campaign/repository/TimeZoneDialModeRepository.java
→
src/main/java/com/viettel/campaign/repository/
ccms_full/
TimeZoneDialModeRepository.java
View file @
96185e71
package
com.viettel.campaign.repository
;
package
com.viettel.campaign.repository
.ccms_full
;
import
com.viettel.campaign.model.TimeZoneDialMode
;
import
com.viettel.campaign.model.
ccms_full.
TimeZoneDialMode
;
import
org.springframework.data.jpa.repository.JpaRepository
;
import
org.springframework.data.jpa.repository.JpaRepository
;
import
org.springframework.stereotype.Repository
;
import
org.springframework.stereotype.Repository
;
...
...
src/main/java/com/viettel/campaign/repository/UserActionLogRepositoryCustom.java
→
src/main/java/com/viettel/campaign/repository/
ccms_full/
UserActionLogRepositoryCustom.java
View file @
96185e71
package
com.viettel.campaign.repository
;
package
com.viettel.campaign.repository
.ccms_full
;
import
com.viettel.campaign.web.dto.ResultDTO
;
import
com.viettel.campaign.web.dto.ResultDTO
;
...
...
src/main/java/com/viettel/campaign/repository/impl/AppParamRepositoryImpl.java
→
src/main/java/com/viettel/campaign/repository/
ccms_full/
impl/AppParamRepositoryImpl.java
View file @
96185e71
package
com.viettel.campaign.repository.impl
;
package
com.viettel.campaign.repository.
ccms_full.
impl
;
import
com.viettel.campaign.repository.ApParamRepositoryCustom
;
import
com.viettel.campaign.repository.
ccms_full.
ApParamRepositoryCustom
;
import
org.springframework.stereotype.Repository
;
import
org.springframework.stereotype.Repository
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.transaction.annotation.Transactional
;
...
...
src/main/java/com/viettel/campaign/repository/impl/CampaignCompleteCompleteCodeRepositoryIpml.java
→
src/main/java/com/viettel/campaign/repository/
ccms_full/
impl/CampaignCompleteCompleteCodeRepositoryIpml.java
View file @
96185e71
package
com.viettel.campaign.repository.impl
;
package
com.viettel.campaign.repository.
ccms_full.
impl
;
import
com.viettel.campaign.
model.CampaignCompleteCode
;
import
com.viettel.campaign.
config.DataSourceQualify
;
import
com.viettel.campaign.
repository.CampaignCompleteCodeRepositoryCustom
;
import
com.viettel.campaign.
model.ccms_full.CampaignCompleteCode
;
import
com.viettel.campaign.
web.dto.ResultDTO
;
import
com.viettel.campaign.
repository.ccms_full.CampaignCompleteCodeRepositoryCustom
;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Repository
;
import
org.springframework.stereotype.Repository
;
import
org.springframework.transaction.annotation.Transactional
;
import
javax.persistence.EntityManager
;
import
javax.persistence.EntityManager
;
import
javax.persistence.PersistenceContext
;
@Repository
@Repository
public
class
CampaignCompleteCompleteCodeRepositoryIpml
implements
CampaignCompleteCodeRepositoryCustom
{
public
class
CampaignCompleteCompleteCodeRepositoryIpml
implements
CampaignCompleteCodeRepositoryCustom
{
@Autowired
@Autowired
EntityManager
entityManager
;
@PersistenceContext
(
unitName
=
DataSourceQualify
.
JPA_UNIT_NAME_CCMS_FULL
)
private
EntityManager
entityManager
;
private
Logger
log
=
LoggerFactory
.
getLogger
(
CampaignCompleteCompleteCodeRepositoryIpml
.
class
);
private
Logger
log
=
LoggerFactory
.
getLogger
(
CampaignCompleteCompleteCodeRepositoryIpml
.
class
);
@Transactional
@Override
// @Transactional(DataSourceQualify.CCMS_FULL)
public
CampaignCompleteCode
updateStatusById
(
Long
id
)
{
public
CampaignCompleteCode
updateStatusById
(
Long
id
)
{
CampaignCompleteCode
dto
=
new
CampaignCompleteCode
();
CampaignCompleteCode
dto
=
new
CampaignCompleteCode
();
try
{
try
{
...
@@ -32,7 +34,8 @@ public class CampaignCompleteCompleteCodeRepositoryIpml implements CampaignCompl
...
@@ -32,7 +34,8 @@ public class CampaignCompleteCompleteCodeRepositoryIpml implements CampaignCompl
return
dto
;
return
dto
;
}
}
@Transactional
@Override
// @Transactional(DataSourceQualify.CCMS_FULL)
public
CampaignCompleteCode
findMaxValueCampaignType
(
Long
companySiteId
)
{
public
CampaignCompleteCode
findMaxValueCampaignType
(
Long
companySiteId
)
{
CampaignCompleteCode
result
=
new
CampaignCompleteCode
();
CampaignCompleteCode
result
=
new
CampaignCompleteCode
();
try
{
try
{
...
...
src/main/java/com/viettel/campaign/repository/impl/CampaignExecuteRepositoryImp.java
→
src/main/java/com/viettel/campaign/repository/
ccms_full/
impl/CampaignExecuteRepositoryImp.java
View file @
96185e71
package
com.viettel.campaign.repository.impl
;
package
com.viettel.campaign.repository.
ccms_full.
impl
;
import
com.viettel.campaign.repository.CampaignExecuteRepository
;
import
com.viettel.campaign.config.DataSourceQualify
;
import
com.viettel.campaign.repository.ccms_full.CampaignExecuteRepository
;
import
com.viettel.campaign.utils.Constants
;
import
com.viettel.campaign.utils.Constants
;
import
com.viettel.campaign.utils.DataUtil
;
import
com.viettel.campaign.utils.DataUtil
;
import
com.viettel.campaign.utils.HibernateUtil
;
import
com.viettel.campaign.utils.HibernateUtil
;
...
@@ -17,6 +18,7 @@ import org.hibernate.type.*;
...
@@ -17,6 +18,7 @@ import org.hibernate.type.*;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Qualifier
;
import
org.springframework.data.domain.Page
;
import
org.springframework.data.domain.Page
;
import
org.springframework.data.domain.PageImpl
;
import
org.springframework.data.domain.PageImpl
;
import
org.springframework.data.domain.Pageable
;
import
org.springframework.data.domain.Pageable
;
...
@@ -25,6 +27,7 @@ import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
...
@@ -25,6 +27,7 @@ import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
import
org.springframework.stereotype.Repository
;
import
org.springframework.stereotype.Repository
;
import
javax.persistence.EntityManager
;
import
javax.persistence.EntityManager
;
import
javax.persistence.PersistenceContext
;
import
java.util.*
;
import
java.util.*
;
import
java.util.concurrent.TimeUnit
;
import
java.util.concurrent.TimeUnit
;
...
@@ -34,20 +37,23 @@ public class CampaignExecuteRepositoryImp implements CampaignExecuteRepository {
...
@@ -34,20 +37,23 @@ public class CampaignExecuteRepositoryImp implements CampaignExecuteRepository {
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
CampaignRepositoryImpl
.
class
);
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
CampaignRepositoryImpl
.
class
);
@Autowired
@Autowired
@Qualifier
(
DataSourceQualify
.
NAMED_JDBC_PARAMETER_TEMPLATE_CCMS_FULL
)
NamedParameterJdbcTemplate
namedParameterJdbcTemplate
;
NamedParameterJdbcTemplate
namedParameterJdbcTemplate
;
@Autowired
@Autowired
@PersistenceContext
(
unitName
=
DataSourceQualify
.
JPA_UNIT_NAME_CCMS_FULL
)
EntityManager
entityManager
;
EntityManager
entityManager
;
@Override
@Override
public
List
<
ApParamDTO
>
getComboBoxStatus
(
String
companySiteId
,
String
completeType
)
{
public
List
<
ApParamDTO
>
getComboBoxStatus
(
String
companySiteId
,
String
completeType
)
{
List
<
ApParamDTO
>
list
=
new
ArrayList
<>();
List
<
ApParamDTO
>
list
=
new
ArrayList
<>();
Map
<
String
,
String
>
params
=
new
HashMap
<>();
Map
<
String
,
String
>
params
=
new
HashMap
<>();
String
sql
=
SQLBuilder
.
getSqlQueryById
(
Constants
.
SQL_MODULES
.
MODULE_EXECUTE
,
"get-combo-status"
);
String
sql
=
SQLBuilder
.
getSqlQueryById
(
Constants
.
SQL_MODULES
.
MODULE_EXECUTE
,
"get-combo-
connect-
status"
);
try
{
try
{
params
.
put
(
"p_company_site_id"
,
companySiteId
);
params
.
put
(
"p_company_site_id"
,
companySiteId
);
params
.
put
(
"p_complete_type"
,
completeType
);
params
.
put
(
"p_complete_type"
,
completeType
);
list
=
namedParameterJdbcTemplate
.
query
(
sql
,
params
,
BeanPropertyRowMapper
.
newInstance
(
ApParamDTO
.
class
));
list
=
namedParameterJdbcTemplate
.
query
(
sql
,
params
,
BeanPropertyRowMapper
.
newInstance
(
ApParamDTO
.
class
));
// list = namedParameterJdbcTemplate.getJdbcTemplate().query(sql, (PreparedStatementSetter) params, BeanPropertyRowMapper.newInstance(ComboBoxDTO.class));
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
logger
.
error
(
e
.
getMessage
(),
e
);
logger
.
error
(
e
.
getMessage
(),
e
);
}
}
...
@@ -81,69 +87,37 @@ public class CampaignExecuteRepositoryImp implements CampaignExecuteRepository {
...
@@ -81,69 +87,37 @@ public class CampaignExecuteRepositoryImp implements CampaignExecuteRepository {
String
sql
=
SQLBuilder
.
getSqlQueryById
(
Constants
.
SQL_MODULES
.
MODULE_EXECUTE
,
"get-execute-interactive"
);
String
sql
=
SQLBuilder
.
getSqlQueryById
(
Constants
.
SQL_MODULES
.
MODULE_EXECUTE
,
"get-execute-interactive"
);
sqlBuilder
.
append
(
sql
);
sqlBuilder
.
append
(
sql
);
sqlBuilder
.
append
(
" and to_char(a.customer_id) like :p_customer_id"
);
sqlBuilder
.
append
(
" and to_char(a.contact_status) in (:p_list_contact_status)"
);
sqlBuilder
.
append
(
" and to_char(a.call_status) in (:p_list_survey_status)"
);
sqlBuilder
.
append
(
" and to_char(a.status) in (:p_list_record_status)"
);
if
(!
DataUtil
.
isNullOrEmpty
(
dto
.
getPhoneNumber
()))
{
sqlBuilder
.
append
(
" and a.phone_number like :p_phone_number"
);
}
if
(!
DataUtil
.
isNullOrEmpty
(
dto
.
getCampaignId
()))
{
sqlBuilder
.
append
(
" and b.campaign_code in (:p_list_campaign_id) "
);
}
if
(!
DataUtil
.
isNullOrEmpty
(
dto
.
getCampaignName
()))
{
if
(!
DataUtil
.
isNullOrEmpty
(
dto
.
getCampaignName
()))
{
sqlBuilder
.
append
(
" and upper(
b.campaign_name) like :p_campaign_name
"
);
sqlBuilder
.
append
(
" and upper(
campaignName) like upper(:p_campaign_name)
"
);
}
}
if
(!
DataUtil
.
isNullOrEmpty
(
dto
.
getAgentId
()))
{
if
(!
DataUtil
.
isNullOrEmpty
(
dto
.
getAgentId
()))
{
sqlBuilder
.
append
(
" and upper(
c.user_name) like :p_user_name
"
);
sqlBuilder
.
append
(
" and upper(
userName) like upper(:p_user_name)
"
);
}
}
SQLQuery
query
=
session
.
createSQLQuery
(
sqlBuilder
.
toString
());
SQLQuery
query
=
session
.
createSQLQuery
(
sqlBuilder
.
toString
());
query
.
setParameter
(
"p_company_site_id"
,
dto
.
getCompanySiteId
());
query
.
setParameterList
(
"p_list_campaign_id"
,
dto
.
getCampaignId
().
split
(
","
));
query
.
setParameter
(
"p_customer_id"
,
"%"
+
dto
.
getCustomerId
()
query
.
setParameter
(
"p_customer_id"
,
dto
.
getCustomerId
());
.
replace
(
"\\"
,
"\\\\"
)
.
replaceAll
(
"%"
,
"\\%"
)
.
replaceAll
(
"_"
,
"\\_"
)
+
"%"
);
query
.
setParameter
(
"p_date_from"
,
dto
.
getFromDate
());
query
.
setParameter
(
"p_date_from"
,
dto
.
getFromDate
());
query
.
setParameter
(
"p_date_to"
,
dto
.
getToDate
());
query
.
setParameter
(
"p_date_to"
,
dto
.
getToDate
());
query
.
setParameterList
(
"p_list_contact_status"
,
dto
.
getContactStatus
().
split
(
","
));
query
.
setParameterList
(
"p_list_contact_status"
,
dto
.
getContactStatus
().
split
(
","
));
query
.
setParameterList
(
"p_list_survey_status"
,
dto
.
getSurveyStatus
().
split
(
","
));
query
.
setParameterList
(
"p_list_survey_status"
,
dto
.
getSurveyStatus
().
split
(
","
));
query
.
setParameterList
(
"p_list_record_status"
,
dto
.
getRecordStatus
().
split
(
","
));
query
.
setParameterList
(
"p_list_record_status"
,
dto
.
getRecordStatus
().
split
(
","
));
query
.
setParameter
(
"p_phone_number"
,
dto
.
getPhoneNumber
());
query
.
setParameter
(
"p_call_time_from"
,
dto
.
getCallTimeFrom
());
query
.
setParameter
(
"p_call_time_from"
,
dto
.
getCallTimeFrom
());
query
.
setParameter
(
"p_call_time_to"
,
dto
.
getCallTimeTo
());
query
.
setParameter
(
"p_call_time_to"
,
dto
.
getCallTimeTo
());
if
(!
DataUtil
.
isNullOrEmpty
(
dto
.
getCampaignId
()))
{
query
.
setParameterList
(
"p_list_campaign_id"
,
dto
.
getCampaignId
().
split
(
","
));
}
if
(!
DataUtil
.
isNullOrEmpty
(
dto
.
getPhoneNumber
()))
{
query
.
setParameter
(
"p_phone_number"
,
"%"
+
dto
.
getPhoneNumber
()
.
replace
(
"\\"
,
"\\\\"
)
.
replaceAll
(
"%"
,
"\\%"
)
.
replaceAll
(
"_"
,
"\\_"
)
+
"%"
);
}
if
(!
DataUtil
.
isNullOrEmpty
(
dto
.
getCampaignName
()))
{
if
(!
DataUtil
.
isNullOrEmpty
(
dto
.
getCampaignName
()))
{
query
.
setParameter
(
"p_campaign_name"
,
"%"
+
dto
.
getCampaignName
().
toUpperCase
()
query
.
setParameter
(
"p_campaign_name"
,
dto
.
getCampaignName
().
trim
());
.
replace
(
"\\"
,
"\\\\"
)
.
replaceAll
(
"%"
,
"\\%"
)
.
replaceAll
(
"_"
,
"\\_"
)
+
"%"
);
}
}
if
(!
DataUtil
.
isNullOrEmpty
(
dto
.
getAgentId
()))
{
if
(!
DataUtil
.
isNullOrEmpty
(
dto
.
getAgentId
()))
{
query
.
setParameter
(
"p_user_name"
,
"%"
+
dto
.
getAgentId
().
toUpperCase
()
query
.
setParameter
(
"p_user_name"
,
dto
.
getAgentId
().
trim
());
.
replace
(
"\\"
,
"\\\\"
)
.
replaceAll
(
"%"
,
"\\%"
)
.
replaceAll
(
"_"
,
"\\_"
)
+
"%"
);
}
}
query
.
addScalar
(
"campaignCode"
,
new
StringType
());
query
.
addScalar
(
"campaignCode"
,
new
StringType
());
query
.
addScalar
(
"campaignName"
,
new
StringType
());
query
.
addScalar
(
"campaignName"
,
new
StringType
());
query
.
addScalar
(
"userName"
,
new
StringType
());
query
.
addScalar
(
"userName"
,
new
StringType
());
query
.
addScalar
(
"phoneNumber"
,
new
Stri
ngType
());
query
.
addScalar
(
"phoneNumber"
,
new
Lo
ngType
());
query
.
addScalar
(
"customerName"
,
new
StringType
());
query
.
addScalar
(
"customerName"
,
new
StringType
());
query
.
addScalar
(
"createTime"
,
new
DateType
());
query
.
addScalar
(
"createTime"
,
new
DateType
());
query
.
addScalar
(
"contactStatus"
,
new
StringType
());
query
.
addScalar
(
"contactStatus"
,
new
StringType
());
...
@@ -187,8 +161,8 @@ public class CampaignExecuteRepositoryImp implements CampaignExecuteRepository {
...
@@ -187,8 +161,8 @@ public class CampaignExecuteRepositoryImp implements CampaignExecuteRepository {
logger
.
error
(
e
.
getMessage
(),
e
);
logger
.
error
(
e
.
getMessage
(),
e
);
}
finally
{
}
finally
{
session
.
close
();
session
.
close
();
return
resultDTO
;
}
}
return
resultDTO
;
}
}
@Override
@Override
...
@@ -203,69 +177,37 @@ public class CampaignExecuteRepositoryImp implements CampaignExecuteRepository {
...
@@ -203,69 +177,37 @@ public class CampaignExecuteRepositoryImp implements CampaignExecuteRepository {
String
sql
=
SQLBuilder
.
getSqlQueryById
(
Constants
.
SQL_MODULES
.
MODULE_EXECUTE
,
"get-execute-interactive"
);
String
sql
=
SQLBuilder
.
getSqlQueryById
(
Constants
.
SQL_MODULES
.
MODULE_EXECUTE
,
"get-execute-interactive"
);
sqlBuilder
.
append
(
sql
);
sqlBuilder
.
append
(
sql
);
sqlBuilder
.
append
(
" and to_char(a.customer_id) like :p_customer_id"
);
sqlBuilder
.
append
(
" and to_char(a.contact_status) in (:p_list_contact_status)"
);
sqlBuilder
.
append
(
" and to_char(a.call_status) in (:p_list_survey_status)"
);
sqlBuilder
.
append
(
" and to_char(a.status) in (:p_list_record_status)"
);
if
(!
DataUtil
.
isNullOrEmpty
(
dto
.
getPhoneNumber
()))
{
sqlBuilder
.
append
(
" and a.phone_number like :p_phone_number"
);
}
if
(!
DataUtil
.
isNullOrEmpty
(
dto
.
getCampaignId
()))
{
sqlBuilder
.
append
(
" and b.campaign_code in (:p_list_campaign_id) "
);
}
if
(!
DataUtil
.
isNullOrEmpty
(
dto
.
getCampaignName
()))
{
if
(!
DataUtil
.
isNullOrEmpty
(
dto
.
getCampaignName
()))
{
sqlBuilder
.
append
(
" and upper(
b.campaign_name) like :p_campaign_name
"
);
sqlBuilder
.
append
(
" and upper(
campaignName) like upper(:p_campaign_name)
"
);
}
}
if
(!
DataUtil
.
isNullOrEmpty
(
dto
.
getAgentId
()))
{
if
(!
DataUtil
.
isNullOrEmpty
(
dto
.
getAgentId
()))
{
sqlBuilder
.
append
(
" and upper(
c.user_name) like :p_user_name
"
);
sqlBuilder
.
append
(
" and upper(
userName) like upper(:p_user_name)
"
);
}
}
SQLQuery
query
=
session
.
createSQLQuery
(
sqlBuilder
.
toString
());
SQLQuery
query
=
session
.
createSQLQuery
(
sqlBuilder
.
toString
());
query
.
setParameter
(
"p_company_site_id"
,
dto
.
getCompanySiteId
());
query
.
setParameterList
(
"p_list_campaign_id"
,
dto
.
getCampaignId
().
split
(
","
));
query
.
setParameter
(
"p_customer_id"
,
"%"
+
dto
.
getCustomerId
()
query
.
setParameter
(
"p_customer_id"
,
dto
.
getCustomerId
());
.
replace
(
"\\"
,
"\\\\"
)
.
replaceAll
(
"%"
,
"\\%"
)
.
replaceAll
(
"_"
,
"\\_"
)
+
"%"
);
query
.
setParameter
(
"p_date_from"
,
dto
.
getFromDate
());
query
.
setParameter
(
"p_date_from"
,
dto
.
getFromDate
());
query
.
setParameter
(
"p_date_to"
,
dto
.
getToDate
());
query
.
setParameter
(
"p_date_to"
,
dto
.
getToDate
());
query
.
setParameterList
(
"p_list_contact_status"
,
dto
.
getContactStatus
().
split
(
","
));
query
.
setParameterList
(
"p_list_contact_status"
,
dto
.
getContactStatus
().
split
(
","
));
query
.
setParameterList
(
"p_list_survey_status"
,
dto
.
getSurveyStatus
().
split
(
","
));
query
.
setParameterList
(
"p_list_survey_status"
,
dto
.
getSurveyStatus
().
split
(
","
));
query
.
setParameterList
(
"p_list_record_status"
,
dto
.
getRecordStatus
().
split
(
","
));
query
.
setParameterList
(
"p_list_record_status"
,
dto
.
getRecordStatus
().
split
(
","
));
query
.
setParameter
(
"p_phone_number"
,
dto
.
getPhoneNumber
());
query
.
setParameter
(
"p_call_time_from"
,
dto
.
getCallTimeFrom
());
query
.
setParameter
(
"p_call_time_from"
,
dto
.
getCallTimeFrom
());
query
.
setParameter
(
"p_call_time_to"
,
dto
.
getCallTimeTo
());
query
.
setParameter
(
"p_call_time_to"
,
dto
.
getCallTimeTo
());
if
(!
DataUtil
.
isNullOrEmpty
(
dto
.
getCampaignId
()))
{
query
.
setParameterList
(
"p_list_campaign_id"
,
dto
.
getCampaignId
().
split
(
","
));
}
if
(!
DataUtil
.
isNullOrEmpty
(
dto
.
getPhoneNumber
()))
{
query
.
setParameter
(
"p_phone_number"
,
"%"
+
dto
.
getPhoneNumber
()
.
replace
(
"\\"
,
"\\\\"
)
.
replaceAll
(
"%"
,
"\\%"
)
.
replaceAll
(
"_"
,
"\\_"
)
+
"%"
);
}
if
(!
DataUtil
.
isNullOrEmpty
(
dto
.
getCampaignName
()))
{
if
(!
DataUtil
.
isNullOrEmpty
(
dto
.
getCampaignName
()))
{
query
.
setParameter
(
"p_campaign_name"
,
"%"
+
dto
.
getCampaignName
().
toUpperCase
()
query
.
setParameter
(
"p_campaign_name"
,
dto
.
getCampaignName
().
trim
());
.
replace
(
"\\"
,
"\\\\"
)
.
replaceAll
(
"%"
,
"\\%"
)
.
replaceAll
(
"_"
,
"\\_"
)
+
"%"
);
}
}
if
(!
DataUtil
.
isNullOrEmpty
(
dto
.
getAgentId
()))
{
if
(!
DataUtil
.
isNullOrEmpty
(
dto
.
getAgentId
()))
{
query
.
setParameter
(
"p_user_name"
,
"%"
+
dto
.
getAgentId
().
toUpperCase
()
query
.
setParameter
(
"p_user_name"
,
dto
.
getAgentId
().
trim
());
.
replace
(
"\\"
,
"\\\\"
)
.
replaceAll
(
"%"
,
"\\%"
)
.
replaceAll
(
"_"
,
"\\_"
)
+
"%"
);
}
}
query
.
addScalar
(
"campaignCode"
,
new
StringType
());
query
.
addScalar
(
"campaignCode"
,
new
StringType
());
query
.
addScalar
(
"campaignName"
,
new
StringType
());
query
.
addScalar
(
"campaignName"
,
new
StringType
());
query
.
addScalar
(
"userName"
,
new
StringType
());
query
.
addScalar
(
"userName"
,
new
StringType
());
query
.
addScalar
(
"phoneNumber"
,
new
Stri
ngType
());
query
.
addScalar
(
"phoneNumber"
,
new
Lo
ngType
());
query
.
addScalar
(
"customerName"
,
new
StringType
());
query
.
addScalar
(
"customerName"
,
new
StringType
());
query
.
addScalar
(
"createTime"
,
new
DateType
());
query
.
addScalar
(
"createTime"
,
new
DateType
());
query
.
addScalar
(
"contactStatus"
,
new
StringType
());
query
.
addScalar
(
"contactStatus"
,
new
StringType
());
...
...
src/main/java/com/viettel/campaign/repository/impl/CampaignRepositoryImpl.java
→
src/main/java/com/viettel/campaign/repository/
ccms_full/
impl/CampaignRepositoryImpl.java
View file @
96185e71
package
com.viettel.campaign.repository.impl
;
package
com.viettel.campaign.repository.
ccms_full.
impl
;
import
com.viettel.campaign.repository.CampaignRepositoryCustom
;
import
com.viettel.campaign.config.DataSourceQualify
;
import
com.viettel.campaign.repository.ccms_full.CampaignRepositoryCustom
;
import
com.viettel.campaign.utils.Constants
;
import
com.viettel.campaign.utils.Constants
;
import
com.viettel.campaign.utils.DataUtil
;
import
com.viettel.campaign.utils.DataUtil
;
import
com.viettel.campaign.utils.HibernateUtil
;
import
com.viettel.campaign.utils.HibernateUtil
;
...
@@ -20,6 +21,7 @@ import org.springframework.data.domain.*;
...
@@ -20,6 +21,7 @@ import org.springframework.data.domain.*;
import
org.springframework.stereotype.Repository
;
import
org.springframework.stereotype.Repository
;
import
javax.persistence.EntityManager
;
import
javax.persistence.EntityManager
;
import
javax.persistence.PersistenceContext
;
import
javax.persistence.Query
;
import
javax.persistence.Query
;
import
java.math.BigDecimal
;
import
java.math.BigDecimal
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
...
@@ -32,6 +34,7 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
...
@@ -32,6 +34,7 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
private
static
final
Logger
logger
=
LogManager
.
getLogger
(
CampaignRepositoryImpl
.
class
);
private
static
final
Logger
logger
=
LogManager
.
getLogger
(
CampaignRepositoryImpl
.
class
);
@Autowired
@Autowired
@PersistenceContext
(
unitName
=
DataSourceQualify
.
JPA_UNIT_NAME_CCMS_FULL
)
EntityManager
entityManager
;
EntityManager
entityManager
;
@Override
@Override
...
...
src/main/java/com/viettel/campaign/repository/impl/TicketRepositoryImpl.java
→
src/main/java/com/viettel/campaign/repository/
ccms_full/
impl/TicketRepositoryImpl.java
View file @
96185e71
package
com.viettel.campaign.repository.impl
;
package
com.viettel.campaign.repository.
ccms_full.
impl
;
import
com.viettel.campaign.repository.TicketRepositoryCustom
;
import
com.viettel.campaign.config.DataSourceQualify
;
import
com.viettel.campaign.repository.ccms_full.TicketRepositoryCustom
;
import
com.viettel.campaign.web.dto.TicketDTO
;
import
com.viettel.campaign.web.dto.TicketDTO
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.data.domain.Pageable
;
import
org.springframework.data.domain.Pageable
;
import
javax.persistence.EntityManager
;
import
javax.persistence.EntityManager
;
import
javax.persistence.PersistenceContext
;
import
javax.persistence.Query
;
import
javax.persistence.Query
;
import
java.math.BigDecimal
;
import
java.math.BigDecimal
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
...
@@ -15,6 +17,7 @@ import java.util.List;
...
@@ -15,6 +17,7 @@ import java.util.List;
public
class
TicketRepositoryImpl
implements
TicketRepositoryCustom
{
public
class
TicketRepositoryImpl
implements
TicketRepositoryCustom
{
@Autowired
@Autowired
@PersistenceContext
(
unitName
=
DataSourceQualify
.
JPA_UNIT_NAME_CCMS_FULL
)
EntityManager
entityManager
;
EntityManager
entityManager
;
@Override
@Override
...
...
src/main/java/com/viettel/campaign/repository/impl/UserActionLogRepositoryImpl.java
→
src/main/java/com/viettel/campaign/repository/
ccms_full/
impl/UserActionLogRepositoryImpl.java
View file @
96185e71
package
com.viettel.campaign.repository.impl
;
package
com.viettel.campaign.repository.
ccms_full.
impl
;
import
com.viettel.campaign.repository.UserActionLogRepositoryCustom
;
import
com.viettel.campaign.repository.
ccms_full.
UserActionLogRepositoryCustom
;
import
com.viettel.campaign.utils.Constants
;
import
com.viettel.campaign.utils.Constants
;
import
com.viettel.campaign.utils.HibernateUtil
;
import
com.viettel.campaign.utils.HibernateUtil
;
import
com.viettel.campaign.utils.SQLBuilder
;
import
com.viettel.campaign.utils.SQLBuilder
;
...
...
src/main/java/com/viettel/campaign/service/ApParamService.java
View file @
96185e71
...
@@ -2,7 +2,7 @@ package com.viettel.campaign.service;
...
@@ -2,7 +2,7 @@ package com.viettel.campaign.service;
import
com.viettel.campaign.web.dto.ApParamDTO
;
import
com.viettel.campaign.web.dto.ApParamDTO
;
import
com.viettel.campaign.web.dto.ResultDTO
;
import
com.viettel.campaign.web.dto.ResultDTO
;
import
com.viettel.campaign.model.ApParam
;
import
com.viettel.campaign.model.
ccms_full.
ApParam
;
import
java.util.List
;
import
java.util.List
;
...
...
src/main/java/com/viettel/campaign/service/CampaignService.java
View file @
96185e71
package
com.viettel.campaign.service
;
package
com.viettel.campaign.service
;
import
com.viettel.campaign.model.Campaign
;
import
com.viettel.campaign.model.
ccms_full.
Campaign
;
import
com.viettel.campaign.web.dto.CampaignDTO
;
import
com.viettel.campaign.web.dto.CampaignDTO
;
import
com.viettel.campaign.web.dto.ResultDTO
;
import
com.viettel.campaign.web.dto.ResultDTO
;
import
com.viettel.campaign.web.dto.request_dto.CampaignRequestDTO
;
import
com.viettel.campaign.web.dto.request_dto.CampaignRequestDTO
;
import
java.math.BigDecimal
;
import
java.util.Date
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
...
...
src/main/java/com/viettel/campaign/service/CustomerService.java
View file @
96185e71
package
com.viettel.campaign.service
;
package
com.viettel.campaign.service
;
import
com.viettel.campaign.model.CustomerList
;
import
com.viettel.campaign.model.
ccms_full.
CustomerList
;
import
com.viettel.campaign.web.dto.CustomerContactDTO
;
import
com.viettel.campaign.web.dto.CustomerContactDTO
;
import
com.viettel.campaign.web.dto.CustomerDTO
;
import
com.viettel.campaign.web.dto.CustomerDTO
;
import
com.viettel.campaign.web.dto.CustomerListDTO
;
import
com.viettel.campaign.web.dto.CustomerListDTO
;
...
@@ -40,11 +40,8 @@ public interface CustomerService {
...
@@ -40,11 +40,8 @@ public interface CustomerService {
// ------------ customer contact ------------ //
// ------------ customer contact ------------ //
<<<<<<<
HEAD
=======
ResultDTO
getCustomerContact
(
CustomerContactDTO
customer
);
ResultDTO
getCustomerContact
(
CustomerContactDTO
customer
);
>>>>>>>
1
e6b797350a4aab62031bb2ede27d0beb4dc3bb3
// danh sach khach hang cua chien dich //
// danh sach khach hang cua chien dich //
ResultDTO
searchCustomerListInfoFromCustomerList
(
int
page
,
int
pageSize
,
String
sort
,
Long
campaignId
,
Long
companySiteId
);
ResultDTO
searchCustomerListInfoFromCustomerList
(
int
page
,
int
pageSize
,
String
sort
,
Long
campaignId
,
Long
companySiteId
);
...
...
src/main/java/com/viettel/campaign/service/ProcessConfigService.java
View file @
96185e71
package
com.viettel.campaign.service
;
package
com.viettel.campaign.service
;
import
com.viettel.campaign.model.ProcessConfig
;
import
com.viettel.campaign.model.
ccms_full.
ProcessConfig
;
import
com.viettel.campaign.repository.ProcessConfigRepository
;
import
com.viettel.campaign.repository.
ccms_full.
ProcessConfigRepository
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.transaction.annotation.Transactional
;
...
...
src/main/java/com/viettel/campaign/service/impl/ApParamServiceImpl.java
View file @
96185e71
package
com.viettel.campaign.service.impl
;
package
com.viettel.campaign.service.impl
;
import
com.viettel.campaign.config.DataSourceQualify
;
import
com.viettel.campaign.service.ApParamService
;
import
com.viettel.campaign.service.ApParamService
;
import
com.viettel.campaign.utils.Constants
;
import
com.viettel.campaign.utils.Constants
;
import
com.viettel.campaign.web.dto.ApParamDTO
;
import
com.viettel.campaign.web.dto.ApParamDTO
;
import
com.viettel.campaign.web.dto.ResultDTO
;
import
com.viettel.campaign.web.dto.ResultDTO
;
import
com.viettel.campaign.mapper.ApParamMapper
;
import
com.viettel.campaign.mapper.ApParamMapper
;
import
com.viettel.campaign.model.ApParam
;
import
com.viettel.campaign.model.
ccms_full.
ApParam
;
import
com.viettel.campaign.repository.ApParamRepository
;
import
com.viettel.campaign.repository.
ccms_full.
ApParamRepository
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.data.domain.PageRequest
;
import
org.springframework.data.domain.PageRequest
;
import
org.springframework.data.domain.Sort
;
import
org.springframework.data.domain.Sort
;
...
@@ -14,8 +15,10 @@ import org.springframework.stereotype.Service;
...
@@ -14,8 +15,10 @@ import org.springframework.stereotype.Service;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.List
;
import
org.apache.logging.log4j.LogManager
;
import
org.apache.logging.log4j.LogManager
;
import
org.apache.logging.log4j.Logger
;
import
org.apache.logging.log4j.Logger
;
import
org.springframework.transaction.annotation.Transactional
;
@Service
@Service
public
class
ApParamServiceImpl
implements
ApParamService
{
public
class
ApParamServiceImpl
implements
ApParamService
{
...
@@ -26,11 +29,13 @@ public class ApParamServiceImpl implements ApParamService {
...
@@ -26,11 +29,13 @@ public class ApParamServiceImpl implements ApParamService {
private
static
final
Logger
logger
=
LogManager
.
getLogger
(
ApParamServiceImpl
.
class
);
private
static
final
Logger
logger
=
LogManager
.
getLogger
(
ApParamServiceImpl
.
class
);
@Override
@Override
@Transactional
(
DataSourceQualify
.
CCMS_FULL
)
public
Iterable
<
ApParam
>
getAllParams
(
int
page
,
int
pageSize
,
String
sort
)
{
public
Iterable
<
ApParam
>
getAllParams
(
int
page
,
int
pageSize
,
String
sort
)
{
return
apParamRepository
.
findAll
(
PageRequest
.
of
(
page
,
pageSize
,
Sort
.
by
(
sort
)));
return
apParamRepository
.
findAll
(
PageRequest
.
of
(
page
,
pageSize
,
Sort
.
by
(
sort
)));
}
}
@Override
@Override
@Transactional
(
DataSourceQualify
.
CCMS_FULL
)
public
List
<
ApParam
>
getParamByName
(
int
page
,
int
pageSize
,
String
sort
,
String
parName
)
{
public
List
<
ApParam
>
getParamByName
(
int
page
,
int
pageSize
,
String
sort
,
String
parName
)
{
List
<
ApParam
>
lst
=
new
ArrayList
<>();
List
<
ApParam
>
lst
=
new
ArrayList
<>();
...
@@ -41,6 +46,7 @@ public class ApParamServiceImpl implements ApParamService {
...
@@ -41,6 +46,7 @@ public class ApParamServiceImpl implements ApParamService {
@Override
@Override
@Transactional
(
DataSourceQualify
.
CCMS_FULL
)
public
ResultDTO
createApParam
(
ApParamDTO
apParamDTO
)
{
public
ResultDTO
createApParam
(
ApParamDTO
apParamDTO
)
{
ResultDTO
result
=
new
ResultDTO
();
ResultDTO
result
=
new
ResultDTO
();
ApParamMapper
apParamMapper
=
new
ApParamMapper
();
ApParamMapper
apParamMapper
=
new
ApParamMapper
();
...
@@ -67,6 +73,7 @@ public class ApParamServiceImpl implements ApParamService {
...
@@ -67,6 +73,7 @@ public class ApParamServiceImpl implements ApParamService {
}
}
@Override
@Override
@Transactional
(
DataSourceQualify
.
CCMS_FULL
)
public
ResultDTO
findParamByParType
(
String
parType
)
{
public
ResultDTO
findParamByParType
(
String
parType
)
{
ResultDTO
resultDTO
=
new
ResultDTO
();
ResultDTO
resultDTO
=
new
ResultDTO
();
try
{
try
{
...
...
src/main/java/com/viettel/campaign/service/impl/CampaignCompleteCodeServiceImpl.java
View file @
96185e71
package
com.viettel.campaign.service.impl
;
package
com.viettel.campaign.service.impl
;
import
com.viettel.campaign.config.DataSourceQualify
;
import
com.viettel.campaign.mapper.CampaignCompleteCodeMapper
;
import
com.viettel.campaign.mapper.CampaignCompleteCodeMapper
;
import
com.viettel.campaign.model.CampaignCompleteCode
;
import
com.viettel.campaign.model.
ccms_full.
CampaignCompleteCode
;
import
com.viettel.campaign.repository.CampaignCompleteCodeRepository
;
import
com.viettel.campaign.repository.
ccms_full.
CampaignCompleteCodeRepository
;
import
com.viettel.campaign.service.CampaignCompleteCodeService
;
import
com.viettel.campaign.service.CampaignCompleteCodeService
;
import
com.viettel.campaign.utils.Constants
;
import
com.viettel.campaign.utils.Constants
;
import
com.viettel.campaign.utils.DataUtil
;
import
com.viettel.campaign.utils.DataUtil
;
...
@@ -36,6 +37,7 @@ public class CampaignCompleteCodeServiceImpl implements CampaignCompleteCodeServ
...
@@ -36,6 +37,7 @@ public class CampaignCompleteCodeServiceImpl implements CampaignCompleteCodeServ
CampaignCompleteCodeRepository
completeCodeRepository
;
CampaignCompleteCodeRepository
completeCodeRepository
;
@Override
@Override
@Transactional
(
DataSourceQualify
.
CCMS_FULL
)
public
Map
listAllCompleteCode
(
int
page
,
int
pageSize
,
String
sort
)
{
public
Map
listAllCompleteCode
(
int
page
,
int
pageSize
,
String
sort
)
{
Map
result
=
new
HashMap
();
Map
result
=
new
HashMap
();
Page
<
CampaignCompleteCode
>
pg
=
completeCodeRepository
.
findAll
(
PageRequest
.
of
(
page
,
pageSize
,
Sort
.
by
(
sort
)));
Page
<
CampaignCompleteCode
>
pg
=
completeCodeRepository
.
findAll
(
PageRequest
.
of
(
page
,
pageSize
,
Sort
.
by
(
sort
)));
...
@@ -45,6 +47,7 @@ public class CampaignCompleteCodeServiceImpl implements CampaignCompleteCodeServ
...
@@ -45,6 +47,7 @@ public class CampaignCompleteCodeServiceImpl implements CampaignCompleteCodeServ
}
}
@Override
@Override
@Transactional
(
DataSourceQualify
.
CCMS_FULL
)
public
Map
listCompleteCodeByName
(
int
page
,
int
pageSize
,
String
sort
,
String
name
)
{
public
Map
listCompleteCodeByName
(
int
page
,
int
pageSize
,
String
sort
,
String
name
)
{
Map
result
=
new
HashMap
();
Map
result
=
new
HashMap
();
List
<
CampaignCompleteCode
>
lst
=
new
ArrayList
<>();
List
<
CampaignCompleteCode
>
lst
=
new
ArrayList
<>();
...
@@ -60,6 +63,7 @@ public class CampaignCompleteCodeServiceImpl implements CampaignCompleteCodeServ
...
@@ -60,6 +63,7 @@ public class CampaignCompleteCodeServiceImpl implements CampaignCompleteCodeServ
}
}
@Override
@Override
@Transactional
(
DataSourceQualify
.
CCMS_FULL
)
public
ResultDTO
createCompleteCode
(
CampaignCompleteCodeDTO
completeCodeDTO
)
{
public
ResultDTO
createCompleteCode
(
CampaignCompleteCodeDTO
completeCodeDTO
)
{
ResultDTO
resultDTO
=
new
ResultDTO
();
ResultDTO
resultDTO
=
new
ResultDTO
();
CampaignCompleteCodeMapper
compCodeMapper
=
new
CampaignCompleteCodeMapper
();
CampaignCompleteCodeMapper
compCodeMapper
=
new
CampaignCompleteCodeMapper
();
...
@@ -86,6 +90,7 @@ public class CampaignCompleteCodeServiceImpl implements CampaignCompleteCodeServ
...
@@ -86,6 +90,7 @@ public class CampaignCompleteCodeServiceImpl implements CampaignCompleteCodeServ
}
}
@Override
@Override
@Transactional
(
DataSourceQualify
.
CCMS_FULL
)
public
ResultDTO
updateCompleteCode
(
CampaignCompleteCodeDTO
completeCodeDTO
)
{
public
ResultDTO
updateCompleteCode
(
CampaignCompleteCodeDTO
completeCodeDTO
)
{
ResultDTO
resultDTO
=
new
ResultDTO
();
ResultDTO
resultDTO
=
new
ResultDTO
();
CampaignCompleteCodeMapper
compCodeMapper
=
new
CampaignCompleteCodeMapper
();
CampaignCompleteCodeMapper
compCodeMapper
=
new
CampaignCompleteCodeMapper
();
...
@@ -112,6 +117,7 @@ public class CampaignCompleteCodeServiceImpl implements CampaignCompleteCodeServ
...
@@ -112,6 +117,7 @@ public class CampaignCompleteCodeServiceImpl implements CampaignCompleteCodeServ
}
}
@Override
@Override
@Transactional
(
DataSourceQualify
.
CCMS_FULL
)
public
ResultDTO
deleteCompleteCode
(
CampaignCompleteCodeDTO
completeCodeDTO
)
{
public
ResultDTO
deleteCompleteCode
(
CampaignCompleteCodeDTO
completeCodeDTO
)
{
ResultDTO
resultDTO
=
new
ResultDTO
();
ResultDTO
resultDTO
=
new
ResultDTO
();
CampaignCompleteCodeMapper
compCodeMapper
=
new
CampaignCompleteCodeMapper
();
CampaignCompleteCodeMapper
compCodeMapper
=
new
CampaignCompleteCodeMapper
();
...
@@ -136,8 +142,8 @@ public class CampaignCompleteCodeServiceImpl implements CampaignCompleteCodeServ
...
@@ -136,8 +142,8 @@ public class CampaignCompleteCodeServiceImpl implements CampaignCompleteCodeServ
return
resultDTO
;
return
resultDTO
;
}
}
@Transactional
@Override
@Override
@Transactional
(
DataSourceQualify
.
CCMS_FULL
)
public
ResultDTO
deleteList
(
List
<
Long
>
completeCodeDtos
)
{
public
ResultDTO
deleteList
(
List
<
Long
>
completeCodeDtos
)
{
ResultDTO
resultDTO
=
new
ResultDTO
();
ResultDTO
resultDTO
=
new
ResultDTO
();
try
{
try
{
...
@@ -156,6 +162,7 @@ public class CampaignCompleteCodeServiceImpl implements CampaignCompleteCodeServ
...
@@ -156,6 +162,7 @@ public class CampaignCompleteCodeServiceImpl implements CampaignCompleteCodeServ
}
}
@Override
@Override
@Transactional
(
DataSourceQualify
.
CCMS_FULL
)
public
ResultDTO
deleteById
(
Long
id
)
{
public
ResultDTO
deleteById
(
Long
id
)
{
ResultDTO
result
=
new
ResultDTO
();
ResultDTO
result
=
new
ResultDTO
();
...
@@ -172,7 +179,7 @@ public class CampaignCompleteCodeServiceImpl implements CampaignCompleteCodeServ
...
@@ -172,7 +179,7 @@ public class CampaignCompleteCodeServiceImpl implements CampaignCompleteCodeServ
return
result
;
return
result
;
}
}
//
@Override
//
@Override
// public ResultDTO findMaxValueCampaignCompleteCode(CampaignCompleteCodeDTO completeCodeDTO) {
// public ResultDTO findMaxValueCampaignCompleteCode(CampaignCompleteCodeDTO completeCodeDTO) {
// ResultDTO resultDTO = new ResultDTO();
// ResultDTO resultDTO = new ResultDTO();
// CampaignCompleteCodeMapper campaignCompleteCodeMapper = new CampaignCompleteCodeMapper();
// CampaignCompleteCodeMapper campaignCompleteCodeMapper = new CampaignCompleteCodeMapper();
...
@@ -203,6 +210,7 @@ public class CampaignCompleteCodeServiceImpl implements CampaignCompleteCodeServ
...
@@ -203,6 +210,7 @@ public class CampaignCompleteCodeServiceImpl implements CampaignCompleteCodeServ
// }
// }
@Override
@Override
@Transactional
(
DataSourceQualify
.
CCMS_FULL
)
public
ResultDTO
findMaxValueCampaignCompleteCode
(
CampaignCompleteCodeDTO
completeCodeDTO
)
{
public
ResultDTO
findMaxValueCampaignCompleteCode
(
CampaignCompleteCodeDTO
completeCodeDTO
)
{
ResultDTO
resultDTO
=
new
ResultDTO
();
ResultDTO
resultDTO
=
new
ResultDTO
();
SessionFactory
sessionFactory
=
HibernateUtil
.
getSessionFactory
();
SessionFactory
sessionFactory
=
HibernateUtil
.
getSessionFactory
();
...
@@ -252,6 +260,7 @@ public class CampaignCompleteCodeServiceImpl implements CampaignCompleteCodeServ
...
@@ -252,6 +260,7 @@ public class CampaignCompleteCodeServiceImpl implements CampaignCompleteCodeServ
}
}
@Override
@Override
@Transactional
(
DataSourceQualify
.
CCMS_FULL
)
public
ResultDTO
getListStatus
(
String
completeValue
,
Short
completeType
,
Long
companySiteId
)
{
public
ResultDTO
getListStatus
(
String
completeValue
,
Short
completeType
,
Long
companySiteId
)
{
ResultDTO
resultDTO
=
new
ResultDTO
();
ResultDTO
resultDTO
=
new
ResultDTO
();
try
{
try
{
...
@@ -268,6 +277,7 @@ public class CampaignCompleteCodeServiceImpl implements CampaignCompleteCodeServ
...
@@ -268,6 +277,7 @@ public class CampaignCompleteCodeServiceImpl implements CampaignCompleteCodeServ
}
}
@Override
@Override
@Transactional
(
DataSourceQualify
.
CCMS_FULL
)
public
ResultDTO
getListStatusWithoutType
(
String
completeValue
,
Short
completeType
,
Long
companySiteId
)
{
public
ResultDTO
getListStatusWithoutType
(
String
completeValue
,
Short
completeType
,
Long
companySiteId
)
{
ResultDTO
resultDTO
=
new
ResultDTO
();
ResultDTO
resultDTO
=
new
ResultDTO
();
try
{
try
{
...
@@ -282,7 +292,7 @@ public class CampaignCompleteCodeServiceImpl implements CampaignCompleteCodeServ
...
@@ -282,7 +292,7 @@ public class CampaignCompleteCodeServiceImpl implements CampaignCompleteCodeServ
return
resultDTO
;
return
resultDTO
;
}
}
// @Override
//
@Override
// public ResultDTO findMaxValueCampaignCompleteCode(CampaignCompleteCodeDTO completeCodeDTO) {
// public ResultDTO findMaxValueCampaignCompleteCode(CampaignCompleteCodeDTO completeCodeDTO) {
// ResultDTO result = new ResultDTO();
// ResultDTO result = new ResultDTO();
// CampaignCompleteCodeMapper campaignCompleteCodeMapper = new CampaignCompleteCodeMapper();
// CampaignCompleteCodeMapper campaignCompleteCodeMapper = new CampaignCompleteCodeMapper();
...
...
src/main/java/com/viettel/campaign/service/impl/CampaignExecuteServiceImp.java
View file @
96185e71
package
com.viettel.campaign.service.impl
;
package
com.viettel.campaign.service.impl
;
import
com.viettel.campaign.repository.CampaignExecuteRepository
;
import
com.viettel.campaign.config.DataSourceQualify
;
import
com.viettel.campaign.repository.ccms_full.CampaignExecuteRepository
;
import
com.viettel.campaign.service.CampaignExecuteService
;
import
com.viettel.campaign.service.CampaignExecuteService
;
import
com.viettel.campaign.utils.BundleUtils
;
import
com.viettel.campaign.utils.BundleUtils
;
import
com.viettel.campaign.utils.Constants
;
import
com.viettel.campaign.utils.Constants
;
...
@@ -8,7 +9,6 @@ import com.viettel.campaign.web.dto.ApParamDTO;
...
@@ -8,7 +9,6 @@ import com.viettel.campaign.web.dto.ApParamDTO;
import
com.viettel.campaign.web.dto.ContactCustResultDTO
;
import
com.viettel.campaign.web.dto.ContactCustResultDTO
;
import
com.viettel.campaign.web.dto.ResultDTO
;
import
com.viettel.campaign.web.dto.ResultDTO
;
import
com.viettel.campaign.web.dto.request_dto.CampaignRequestDTO
;
import
com.viettel.campaign.web.dto.request_dto.CampaignRequestDTO
;
import
org.apache.commons.collections4.BagUtils
;
import
org.apache.poi.ss.usermodel.*
;
import
org.apache.poi.ss.usermodel.*
;
import
org.apache.poi.ss.util.CellRangeAddress
;
import
org.apache.poi.ss.util.CellRangeAddress
;
import
org.apache.poi.xssf.usermodel.XSSFWorkbook
;
import
org.apache.poi.xssf.usermodel.XSSFWorkbook
;
...
@@ -16,8 +16,8 @@ import org.slf4j.Logger;
...
@@ -16,8 +16,8 @@ import org.slf4j.Logger;
import
org.slf4j.LoggerFactory
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
import
java.text.DateFormat
;
import
java.text.SimpleDateFormat
;
import
java.text.SimpleDateFormat
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.List
;
...
@@ -34,6 +34,7 @@ public class CampaignExecuteServiceImp implements CampaignExecuteService {
...
@@ -34,6 +34,7 @@ public class CampaignExecuteServiceImp implements CampaignExecuteService {
//<editor-fold: hungtt>
//<editor-fold: hungtt>
@Override
@Override
@Transactional
(
DataSourceQualify
.
CCMS_FULL
)
public
ResultDTO
getComboBoxStatus
(
String
companySiteId
,
String
completeType
)
{
public
ResultDTO
getComboBoxStatus
(
String
companySiteId
,
String
completeType
)
{
ResultDTO
resultDTO
=
new
ResultDTO
();
ResultDTO
resultDTO
=
new
ResultDTO
();
try
{
try
{
...
@@ -48,6 +49,7 @@ public class CampaignExecuteServiceImp implements CampaignExecuteService {
...
@@ -48,6 +49,7 @@ public class CampaignExecuteServiceImp implements CampaignExecuteService {
}
}
@Override
@Override
@Transactional
(
DataSourceQualify
.
CCMS_FULL
)
public
ResultDTO
getComboCampaignType
(
String
companySiteId
)
{
public
ResultDTO
getComboCampaignType
(
String
companySiteId
)
{
ResultDTO
resultDTO
=
new
ResultDTO
();
ResultDTO
resultDTO
=
new
ResultDTO
();
try
{
try
{
...
@@ -62,6 +64,7 @@ public class CampaignExecuteServiceImp implements CampaignExecuteService {
...
@@ -62,6 +64,7 @@ public class CampaignExecuteServiceImp implements CampaignExecuteService {
}
}
@Override
@Override
@Transactional
(
DataSourceQualify
.
CCMS_FULL
)
public
ResultDTO
searchInteractiveResult
(
CampaignRequestDTO
dto
)
{
public
ResultDTO
searchInteractiveResult
(
CampaignRequestDTO
dto
)
{
ResultDTO
resultDTO
=
new
ResultDTO
();
ResultDTO
resultDTO
=
new
ResultDTO
();
try
{
try
{
...
@@ -73,6 +76,7 @@ public class CampaignExecuteServiceImp implements CampaignExecuteService {
...
@@ -73,6 +76,7 @@ public class CampaignExecuteServiceImp implements CampaignExecuteService {
}
}
@Override
@Override
@Transactional
(
DataSourceQualify
.
CCMS_FULL
)
public
XSSFWorkbook
exportInteractiveResult
(
CampaignRequestDTO
dto
)
{
public
XSSFWorkbook
exportInteractiveResult
(
CampaignRequestDTO
dto
)
{
Locale
locale
=
Locale
.
forLanguageTag
(
"vi"
);
Locale
locale
=
Locale
.
forLanguageTag
(
"vi"
);
List
<
ContactCustResultDTO
>
list
=
campaignExecuteRepository
.
getExcelInteractiveResult
(
dto
);
List
<
ContactCustResultDTO
>
list
=
campaignExecuteRepository
.
getExcelInteractiveResult
(
dto
);
...
@@ -156,20 +160,20 @@ public class CampaignExecuteServiceImp implements CampaignExecuteService {
...
@@ -156,20 +160,20 @@ public class CampaignExecuteServiceImp implements CampaignExecuteService {
for
(
int
i
=
0
,
rowIndex
=
1
;
i
<
list
.
size
();
i
++)
{
for
(
int
i
=
0
,
rowIndex
=
1
;
i
<
list
.
size
();
i
++)
{
Row
row
=
sheet
.
createRow
(
startRowTable
+
count
);
Row
row
=
sheet
.
createRow
(
startRowTable
+
count
);
int
col
=
0
;
int
col
=
0
;
writeCellContent
(
row
,
styleRow
,
col
++,
rowIndex
);
writeCellContent
(
row
,
styleRow
,
col
++,
rowIndex
);
writeCellContent
(
row
,
styleRow
,
col
++,
list
.
get
(
i
).
getCampaignCode
());
writeCellContent
(
row
,
styleRow
,
col
++,
list
.
get
(
i
).
getCampaignCode
());
writeCellContent
(
row
,
styleRow
,
col
++,
list
.
get
(
i
).
getCampaignName
());
writeCellContent
(
row
,
styleRow
,
col
++,
list
.
get
(
i
).
getCampaignName
());
writeCellContent
(
row
,
styleRow
,
col
++,
list
.
get
(
i
).
getAgentId
());
writeCellContent
(
row
,
styleRow
,
col
++,
list
.
get
(
i
).
getAgentId
());
writeCellContent
(
row
,
styleRow
,
col
++,
list
.
get
(
i
).
getPhoneNumber
());
writeCellContent
(
row
,
styleRow
,
col
++,
list
.
get
(
i
).
getPhoneNumber
());
writeCellContent
(
row
,
styleRow
,
col
++,
list
.
get
(
i
).
getCustomerId
());
writeCellContent
(
row
,
styleRow
,
col
++,
list
.
get
(
i
).
getCustomerId
());
writeCellContent
(
row
,
styleRow
,
col
++,
list
.
get
(
i
).
getCustomerName
());
writeCellContent
(
row
,
styleRow
,
col
++,
list
.
get
(
i
).
getCustomerName
());
writeCellContent
(
row
,
styleRow
,
col
++,
formatter
.
format
(
list
.
get
(
i
).
getCreateTime
()));
writeCellContent
(
row
,
styleRow
,
col
++,
formatter
.
format
(
list
.
get
(
i
).
getCreateTime
()));
writeCellContent
(
row
,
styleRow
,
col
++,
list
.
get
(
i
).
getContactStatus
());
writeCellContent
(
row
,
styleRow
,
col
++,
list
.
get
(
i
).
getContactStatus
());
writeCellContent
(
row
,
styleRow
,
col
++,
list
.
get
(
i
).
getSurveyStatus
());
writeCellContent
(
row
,
styleRow
,
col
++,
list
.
get
(
i
).
getSurveyStatus
());
writeCellContent
(
row
,
styleRow
,
col
++,
list
.
get
(
i
).
getStatus
());
writeCellContent
(
row
,
styleRow
,
col
++,
list
.
get
(
i
).
getStatus
());
writeCellContent
(
row
,
styleRow
,
col
++,
list
.
get
(
i
).
getRecordStatus
());
writeCellContent
(
row
,
styleRow
,
col
++,
list
.
get
(
i
).
getRecordStatus
());
++
rowIndex
;
++
rowIndex
;
++
count
;
++
count
;
}
}
return
workbook
;
return
workbook
;
}
}
...
...
src/main/java/com/viettel/campaign/service/impl/CampaignServiceImpl.java
View file @
96185e71
package
com.viettel.campaign.service.impl
;
package
com.viettel.campaign.service.impl
;
import
com.viettel.campaign.model.Campaign
;
import
com.viettel.campaign.config.DataSourceQualify
;
import
com.viettel.campaign.model.TimeRangeDialMode
;
import
com.viettel.campaign.model.ccms_full.Campaign
;
import
com.viettel.campaign.model.TimeZoneDialMode
;
import
com.viettel.campaign.model.ccms_full.TimeRangeDialMode
;
import
com.viettel.campaign.model.ccms_full.TimeZoneDialMode
;
//import com.viettel.campaign.model.UserActionLog;
//import com.viettel.campaign.model.UserActionLog;
import
com.viettel.campaign.repository.CampaignRepository
;
import
com.viettel.campaign.repository.
ccms_full.
CampaignRepository
;
import
com.viettel.campaign.repository.TimeRangeDialModeRepository
;
import
com.viettel.campaign.repository.
ccms_full.
TimeRangeDialModeRepository
;
import
com.viettel.campaign.repository.TimeZoneDialModeRepository
;
import
com.viettel.campaign.repository.
ccms_full.
TimeZoneDialModeRepository
;
//import com.viettel.campaign.repository.UserActionLogRepository;
//import com.viettel.campaign.repository.UserActionLogRepository;
import
com.viettel.campaign.repository.UserActionLogRepositoryCustom
;
import
com.viettel.campaign.repository.ccms_full.UserActionLogRepositoryCustom
;
import
com.viettel.campaign.repository.impl.CampaignRepositoryImpl
;
import
com.viettel.campaign.service.CampaignService
;
import
com.viettel.campaign.service.CampaignService
;
import
com.viettel.campaign.utils.Constants
;
import
com.viettel.campaign.utils.Constants
;
import
com.viettel.campaign.web.dto.*
;
import
com.viettel.campaign.web.dto.*
;
...
@@ -21,7 +21,6 @@ import org.springframework.beans.factory.annotation.Autowired;
...
@@ -21,7 +21,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.transaction.annotation.Transactional
;
import
java.math.BigDecimal
;
import
java.util.Date
;
import
java.util.Date
;
import
java.util.HashMap
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.List
;
...
@@ -31,7 +30,7 @@ import java.util.*;
...
@@ -31,7 +30,7 @@ import java.util.*;
@Service
@Service
@Transactional
(
rollbackFor
=
Exception
.
class
)
@Transactional
(
rollbackFor
=
Exception
.
class
)
public
class
CampaignServiceImpl
implements
CampaignService
{
public
class
CampaignServiceImpl
implements
CampaignService
{
private
static
final
Logger
logger
=
LogManager
.
getLogger
(
Campaign
Repository
Impl
.
class
);
private
static
final
Logger
logger
=
LogManager
.
getLogger
(
Campaign
Service
Impl
.
class
);
@Autowired
@Autowired
CampaignRepository
campaignRepository
;
CampaignRepository
campaignRepository
;
...
@@ -49,41 +48,49 @@ public class CampaignServiceImpl implements CampaignService {
...
@@ -49,41 +48,49 @@ public class CampaignServiceImpl implements CampaignService {
ModelMapper
modelMapper
;
ModelMapper
modelMapper
;
@Override
@Override
@Transactional
(
DataSourceQualify
.
CCMS_FULL
)
public
ResultDTO
searchCampaignExecute
(
CampaignRequestDTO
requestDto
)
{
public
ResultDTO
searchCampaignExecute
(
CampaignRequestDTO
requestDto
)
{
return
campaignRepository
.
searchCampaignExecute
(
requestDto
);
return
campaignRepository
.
searchCampaignExecute
(
requestDto
);
}
}
@Override
@Override
@Transactional
(
DataSourceQualify
.
CCMS_FULL
)
public
ResultDTO
search
(
CampaignRequestDTO
requestDto
)
{
public
ResultDTO
search
(
CampaignRequestDTO
requestDto
)
{
return
campaignRepository
.
search
(
requestDto
);
return
campaignRepository
.
search
(
requestDto
);
}
}
@Override
@Override
@Transactional
(
DataSourceQualify
.
CCMS_FULL
)
public
ResultDTO
findByCampaignCode
(
CampaignRequestDTO
requestDTO
)
{
public
ResultDTO
findByCampaignCode
(
CampaignRequestDTO
requestDTO
)
{
return
campaignRepository
.
findByCampaignCode
(
requestDTO
);
return
campaignRepository
.
findByCampaignCode
(
requestDTO
);
}
}
@Override
@Override
@Transactional
(
DataSourceQualify
.
CCMS_FULL
)
public
List
<
Campaign
>
findAllCondition
(
Long
companySiteId
)
{
public
List
<
Campaign
>
findAllCondition
(
Long
companySiteId
)
{
return
campaignRepository
.
findAllByCompanySiteId
(
companySiteId
);
return
campaignRepository
.
findAllByCompanySiteId
(
companySiteId
);
}
}
@Override
@Override
@Transactional
(
DataSourceQualify
.
CCMS_FULL
)
public
List
<
Campaign
>
findCampaignByCompanySiteIdAndStartTimeIsLessThanEqualAndStatusIn
(
Long
siteId
,
Date
startTime
,
List
<
Long
>
status
)
{
public
List
<
Campaign
>
findCampaignByCompanySiteIdAndStartTimeIsLessThanEqualAndStatusIn
(
Long
siteId
,
Date
startTime
,
List
<
Long
>
status
)
{
return
campaignRepository
.
findCampaignByCompanySiteIdAndStartTimeIsLessThanEqualAndStatusIn
(
siteId
,
startTime
,
status
);
return
campaignRepository
.
findCampaignByCompanySiteIdAndStartTimeIsLessThanEqualAndStatusIn
(
siteId
,
startTime
,
status
);
}
}
@Override
@Override
@Transactional
(
DataSourceQualify
.
CCMS_FULL
)
public
List
<
Campaign
>
findCampaignByCompanySiteIdAndEndTimeIsLessThanEqualAndStatusIn
(
Long
siteId
,
Date
endTime
,
List
<
Long
>
status
)
{
public
List
<
Campaign
>
findCampaignByCompanySiteIdAndEndTimeIsLessThanEqualAndStatusIn
(
Long
siteId
,
Date
endTime
,
List
<
Long
>
status
)
{
return
campaignRepository
.
findCampaignByCompanySiteIdAndEndTimeIsLessThanEqualAndStatusIn
(
siteId
,
endTime
,
status
);
return
campaignRepository
.
findCampaignByCompanySiteIdAndEndTimeIsLessThanEqualAndStatusIn
(
siteId
,
endTime
,
status
);
}
}
@Override
@Override
@Transactional
(
DataSourceQualify
.
CCMS_FULL
)
public
Campaign
updateProcess
(
Campaign
c
)
{
public
Campaign
updateProcess
(
Campaign
c
)
{
return
campaignRepository
.
save
(
c
);
return
campaignRepository
.
save
(
c
);
}
}
@Override
@Override
@Transactional
(
DataSourceQualify
.
CCMS_FULL
)
public
ResultDTO
findByCampaignId
(
Long
campaignId
)
{
public
ResultDTO
findByCampaignId
(
Long
campaignId
)
{
ResultDTO
result
=
new
ResultDTO
();
ResultDTO
result
=
new
ResultDTO
();
Campaign
campaign
=
campaignRepository
.
findByCampaignId
(
campaignId
);
Campaign
campaign
=
campaignRepository
.
findByCampaignId
(
campaignId
);
...
@@ -101,6 +108,7 @@ public class CampaignServiceImpl implements CampaignService {
...
@@ -101,6 +108,7 @@ public class CampaignServiceImpl implements CampaignService {
}
}
@Override
@Override
@Transactional
(
DataSourceQualify
.
CCMS_FULL
)
public
ResultDTO
addNewCampaign
(
CampaignDTO
campaignDTO
)
{
public
ResultDTO
addNewCampaign
(
CampaignDTO
campaignDTO
)
{
logger
.
info
(
"=== Start add new campaign "
);
logger
.
info
(
"=== Start add new campaign "
);
ResultDTO
resultDTO
=
new
ResultDTO
();
ResultDTO
resultDTO
=
new
ResultDTO
();
...
@@ -166,6 +174,7 @@ public class CampaignServiceImpl implements CampaignService {
...
@@ -166,6 +174,7 @@ public class CampaignServiceImpl implements CampaignService {
}
}
@Override
@Override
@Transactional
(
DataSourceQualify
.
CCMS_FULL
)
public
ResultDTO
findCampaignById
(
Long
campaignId
)
{
public
ResultDTO
findCampaignById
(
Long
campaignId
)
{
logger
.
info
(
"=== Start find campaign by id: "
+
campaignId
);
logger
.
info
(
"=== Start find campaign by id: "
+
campaignId
);
ResultDTO
resultDTO
=
new
ResultDTO
();
ResultDTO
resultDTO
=
new
ResultDTO
();
...
@@ -185,6 +194,7 @@ public class CampaignServiceImpl implements CampaignService {
...
@@ -185,6 +194,7 @@ public class CampaignServiceImpl implements CampaignService {
}
}
@Override
@Override
@Transactional
(
DataSourceQualify
.
CCMS_FULL
)
public
ResultDTO
changeCampaignStatus
(
CampaignDTO
dto
)
{
public
ResultDTO
changeCampaignStatus
(
CampaignDTO
dto
)
{
ResultDTO
result
=
new
ResultDTO
();
ResultDTO
result
=
new
ResultDTO
();
try
{
try
{
...
@@ -237,6 +247,7 @@ public class CampaignServiceImpl implements CampaignService {
...
@@ -237,6 +247,7 @@ public class CampaignServiceImpl implements CampaignService {
}
}
@Override
@Override
@Transactional
(
DataSourceQualify
.
CCMS_FULL
)
public
ResultDTO
checkAllowStatusToPrepare
(
Long
campaignId
)
{
public
ResultDTO
checkAllowStatusToPrepare
(
Long
campaignId
)
{
return
campaignRepository
.
checkAllowStatusToPrepare
(
campaignId
);
return
campaignRepository
.
checkAllowStatusToPrepare
(
campaignId
);
}
}
...
...
src/main/java/com/viettel/campaign/service/impl/CustomerServiceImpl.java
View file @
96185e71
package
com.viettel.campaign.service.impl
;
package
com.viettel.campaign.service.impl
;
import
com.viettel.campaign.config.DataSourceQualify
;
import
com.viettel.campaign.mapper.CustomerListMapper
;
import
com.viettel.campaign.mapper.CustomerListMapper
;
import
com.viettel.campaign.mapper.CustomerMapper
;
import
com.viettel.campaign.mapper.CustomerMapper
;
import
com.viettel.campaign.model.Customer
;
import
com.viettel.campaign.model.
ccms_full.
Customer
;
import
com.viettel.campaign.model.CustomerContact
;
import
com.viettel.campaign.model.
ccms_full.
CustomerContact
;
import
com.viettel.campaign.model.CustomerList
;
import
com.viettel.campaign.model.
ccms_full.
CustomerList
;
import
com.viettel.campaign.repository.*
;
import
com.viettel.campaign.repository.
ccms_full.
*
;
import
com.viettel.campaign.service.CustomerService
;
import
com.viettel.campaign.service.CustomerService
;
import
com.viettel.campaign.utils.Constants
;
import
com.viettel.campaign.utils.Constants
;
import
com.viettel.campaign.utils.DataUtil
;
import
com.viettel.campaign.utils.DataUtil
;
...
@@ -28,6 +29,7 @@ import org.springframework.stereotype.Service;
...
@@ -28,6 +29,7 @@ import org.springframework.stereotype.Service;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.transaction.annotation.Transactional
;
import
javax.persistence.EntityManager
;
import
javax.persistence.EntityManager
;
import
javax.persistence.PersistenceContext
;
import
javax.persistence.Query
;
import
javax.persistence.Query
;
import
java.util.Date
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.List
;
...
@@ -36,6 +38,7 @@ import java.util.List;
...
@@ -36,6 +38,7 @@ import java.util.List;
public
class
CustomerServiceImpl
implements
CustomerService
{
public
class
CustomerServiceImpl
implements
CustomerService
{
@Autowired
@Autowired
@PersistenceContext
(
unitName
=
DataSourceQualify
.
JPA_UNIT_NAME_CCMS_FULL
)
EntityManager
entityManager
;
EntityManager
entityManager
;
@Autowired
@Autowired
...
@@ -57,6 +60,7 @@ public class CustomerServiceImpl implements CustomerService {
...
@@ -57,6 +60,7 @@ public class CustomerServiceImpl implements CustomerService {
CustomerListMappingRepository
customerListMappingRepository
;
CustomerListMappingRepository
customerListMappingRepository
;
@Override
@Override
@Transactional
(
DataSourceQualify
.
CCMS_FULL
)
public
ResultDTO
getAllCustomer
(
int
page
,
int
pageSize
,
String
sort
,
long
customerListId
,
long
companySiteId
)
{
public
ResultDTO
getAllCustomer
(
int
page
,
int
pageSize
,
String
sort
,
long
customerListId
,
long
companySiteId
)
{
ResultDTO
resultDTO
=
new
ResultDTO
();
ResultDTO
resultDTO
=
new
ResultDTO
();
SessionFactory
sessionFactory
=
HibernateUtil
.
getSessionFactory
();
SessionFactory
sessionFactory
=
HibernateUtil
.
getSessionFactory
();
...
@@ -122,6 +126,7 @@ public class CustomerServiceImpl implements CustomerService {
...
@@ -122,6 +126,7 @@ public class CustomerServiceImpl implements CustomerService {
}
}
@Override
@Override
@Transactional
(
DataSourceQualify
.
CCMS_FULL
)
public
ResultDTO
getCustomerId
(
Long
customerId
)
{
public
ResultDTO
getCustomerId
(
Long
customerId
)
{
ResultDTO
resultDTO
=
new
ResultDTO
();
ResultDTO
resultDTO
=
new
ResultDTO
();
...
@@ -140,6 +145,7 @@ public class CustomerServiceImpl implements CustomerService {
...
@@ -140,6 +145,7 @@ public class CustomerServiceImpl implements CustomerService {
}
}
@Override
@Override
@Transactional
(
DataSourceQualify
.
CCMS_FULL
)
public
ResultDTO
searchAllCustomer
(
int
page
,
int
pageSize
,
String
sort
,
long
customerListId
,
long
companySiteId
,
String
name
,
String
mobileNumber
,
String
email
)
{
public
ResultDTO
searchAllCustomer
(
int
page
,
int
pageSize
,
String
sort
,
long
customerListId
,
long
companySiteId
,
String
name
,
String
mobileNumber
,
String
email
)
{
ResultDTO
resultDTO
=
new
ResultDTO
();
ResultDTO
resultDTO
=
new
ResultDTO
();
SessionFactory
sessionFactory
=
HibernateUtil
.
getSessionFactory
();
SessionFactory
sessionFactory
=
HibernateUtil
.
getSessionFactory
();
...
@@ -238,7 +244,7 @@ public class CustomerServiceImpl implements CustomerService {
...
@@ -238,7 +244,7 @@ public class CustomerServiceImpl implements CustomerService {
}
}
@Override
@Override
@Transactional
@Transactional
(
DataSourceQualify
.
CCMS_FULL
)
public
ResultDTO
createCustomer
(
CustomerDTO
customerDTO
)
{
public
ResultDTO
createCustomer
(
CustomerDTO
customerDTO
)
{
ResultDTO
resultDTO
=
new
ResultDTO
();
ResultDTO
resultDTO
=
new
ResultDTO
();
CustomerMapper
customerMapper
=
new
CustomerMapper
();
CustomerMapper
customerMapper
=
new
CustomerMapper
();
...
@@ -272,8 +278,8 @@ public class CustomerServiceImpl implements CustomerService {
...
@@ -272,8 +278,8 @@ public class CustomerServiceImpl implements CustomerService {
return
resultDTO
;
return
resultDTO
;
}
}
@Transactional
@Override
@Override
@Transactional
(
DataSourceQualify
.
CCMS_FULL
)
public
ResultDTO
deleteCustomer
(
CustomerRequestDTO
customerRequestDTO
)
{
public
ResultDTO
deleteCustomer
(
CustomerRequestDTO
customerRequestDTO
)
{
ResultDTO
resultDTO
=
new
ResultDTO
();
ResultDTO
resultDTO
=
new
ResultDTO
();
try
{
try
{
...
@@ -295,8 +301,8 @@ public class CustomerServiceImpl implements CustomerService {
...
@@ -295,8 +301,8 @@ public class CustomerServiceImpl implements CustomerService {
return
resultDTO
;
return
resultDTO
;
}
}
@Transactional
@Override
@Override
@Transactional
(
DataSourceQualify
.
CCMS_FULL
)
public
ResultDTO
deleteIds
(
CustomerRequestDTO
customerRequestDTO
)
{
public
ResultDTO
deleteIds
(
CustomerRequestDTO
customerRequestDTO
)
{
ResultDTO
resultDTO
=
new
ResultDTO
();
ResultDTO
resultDTO
=
new
ResultDTO
();
try
{
try
{
...
@@ -332,6 +338,7 @@ public class CustomerServiceImpl implements CustomerService {
...
@@ -332,6 +338,7 @@ public class CustomerServiceImpl implements CustomerService {
// ------------- customer list ----------------- //
// ------------- customer list ----------------- //
@Override
@Override
@Transactional
(
DataSourceQualify
.
CCMS_FULL
)
public
ResultDTO
getAllCustomerList
(
int
page
,
int
pageSize
,
String
sort
,
Long
companySiteId
)
{
public
ResultDTO
getAllCustomerList
(
int
page
,
int
pageSize
,
String
sort
,
Long
companySiteId
)
{
ResultDTO
resultDTO
=
new
ResultDTO
();
ResultDTO
resultDTO
=
new
ResultDTO
();
SessionFactory
sessionFactory
=
HibernateUtil
.
getSessionFactory
();
SessionFactory
sessionFactory
=
HibernateUtil
.
getSessionFactory
();
...
@@ -396,6 +403,7 @@ public class CustomerServiceImpl implements CustomerService {
...
@@ -396,6 +403,7 @@ public class CustomerServiceImpl implements CustomerService {
}
}
@Override
@Override
@Transactional
(
DataSourceQualify
.
CCMS_FULL
)
public
ResultDTO
createCustomerList
(
CustomerListDTO
customerListDTO
)
{
public
ResultDTO
createCustomerList
(
CustomerListDTO
customerListDTO
)
{
ResultDTO
resultDTO
=
new
ResultDTO
();
ResultDTO
resultDTO
=
new
ResultDTO
();
CustomerListMapper
customerListMapper
=
new
CustomerListMapper
();
CustomerListMapper
customerListMapper
=
new
CustomerListMapper
();
...
@@ -426,6 +434,7 @@ public class CustomerServiceImpl implements CustomerService {
...
@@ -426,6 +434,7 @@ public class CustomerServiceImpl implements CustomerService {
}
}
@Override
@Override
@Transactional
(
DataSourceQualify
.
CCMS_FULL
)
public
ResultDTO
updateCustomerList
(
CustomerListDTO
customerListDTO
)
{
public
ResultDTO
updateCustomerList
(
CustomerListDTO
customerListDTO
)
{
ResultDTO
resultDTO
=
new
ResultDTO
();
ResultDTO
resultDTO
=
new
ResultDTO
();
CustomerListMapper
customerListMapper
=
new
CustomerListMapper
();
CustomerListMapper
customerListMapper
=
new
CustomerListMapper
();
...
@@ -456,8 +465,8 @@ public class CustomerServiceImpl implements CustomerService {
...
@@ -456,8 +465,8 @@ public class CustomerServiceImpl implements CustomerService {
return
resultDTO
;
return
resultDTO
;
}
}
@Transactional
@Override
@Override
@Transactional
(
DataSourceQualify
.
CCMS_FULL
)
public
ResultDTO
deleteCustomerList
(
CustomerListDTO
customerListDTO
)
{
public
ResultDTO
deleteCustomerList
(
CustomerListDTO
customerListDTO
)
{
ResultDTO
resultDTO
=
new
ResultDTO
();
ResultDTO
resultDTO
=
new
ResultDTO
();
...
@@ -483,8 +492,8 @@ public class CustomerServiceImpl implements CustomerService {
...
@@ -483,8 +492,8 @@ public class CustomerServiceImpl implements CustomerService {
return
resultDTO
;
return
resultDTO
;
}
}
@Transactional
@Override
@Override
@Transactional
(
DataSourceQualify
.
CCMS_FULL
)
public
ResultDTO
deleteCustomerListIds
(
CustomerRequestDTO
customerRequestDTO
)
{
public
ResultDTO
deleteCustomerListIds
(
CustomerRequestDTO
customerRequestDTO
)
{
ResultDTO
resultDTO
=
new
ResultDTO
();
ResultDTO
resultDTO
=
new
ResultDTO
();
try
{
try
{
...
@@ -511,6 +520,7 @@ public class CustomerServiceImpl implements CustomerService {
...
@@ -511,6 +520,7 @@ public class CustomerServiceImpl implements CustomerService {
}
}
@Override
@Override
@Transactional
(
DataSourceQualify
.
CCMS_FULL
)
public
ResultDTO
searchCustomerList
(
SearchCustomerRequestDTO
searchCustomerRequestDTO
)
{
public
ResultDTO
searchCustomerList
(
SearchCustomerRequestDTO
searchCustomerRequestDTO
)
{
ResultDTO
resultDTO
=
new
ResultDTO
();
ResultDTO
resultDTO
=
new
ResultDTO
();
SessionFactory
sessionFactory
=
HibernateUtil
.
getSessionFactory
();
SessionFactory
sessionFactory
=
HibernateUtil
.
getSessionFactory
();
...
@@ -602,11 +612,13 @@ public class CustomerServiceImpl implements CustomerService {
...
@@ -602,11 +612,13 @@ public class CustomerServiceImpl implements CustomerService {
}
}
@Override
@Override
@Transactional
(
DataSourceQualify
.
CCMS_FULL
)
public
CustomerList
getLatestCreated
()
{
public
CustomerList
getLatestCreated
()
{
return
customerListRepository
.
latestCreated
();
return
customerListRepository
.
latestCreated
();
}
}
@Override
@Override
@Transactional
(
DataSourceQualify
.
CCMS_FULL
)
public
ResultDTO
getCustomerContact
(
CustomerContactDTO
customer
)
{
public
ResultDTO
getCustomerContact
(
CustomerContactDTO
customer
)
{
ResultDTO
result
=
new
ResultDTO
();
ResultDTO
result
=
new
ResultDTO
();
...
@@ -630,6 +642,7 @@ public class CustomerServiceImpl implements CustomerService {
...
@@ -630,6 +642,7 @@ public class CustomerServiceImpl implements CustomerService {
}
}
@Override
@Override
@Transactional
(
DataSourceQualify
.
CCMS_FULL
)
public
ResultDTO
getCustomerRecall
(
Long
campaignId
,
Long
customerId
)
{
public
ResultDTO
getCustomerRecall
(
Long
campaignId
,
Long
customerId
)
{
ResultDTO
result
=
new
ResultDTO
();
ResultDTO
result
=
new
ResultDTO
();
...
@@ -652,6 +665,7 @@ public class CustomerServiceImpl implements CustomerService {
...
@@ -652,6 +665,7 @@ public class CustomerServiceImpl implements CustomerService {
}
}
@Override
@Override
@Transactional
(
DataSourceQualify
.
CCMS_FULL
)
public
ResultDTO
searchCustomerListInfoFromCustomerList
(
int
page
,
int
pageSize
,
String
sort
,
Long
campaignId
,
Long
companySiteId
)
{
public
ResultDTO
searchCustomerListInfoFromCustomerList
(
int
page
,
int
pageSize
,
String
sort
,
Long
campaignId
,
Long
companySiteId
)
{
ResultDTO
resultDTO
=
new
ResultDTO
();
ResultDTO
resultDTO
=
new
ResultDTO
();
try
{
try
{
...
...
src/main/java/com/viettel/campaign/service/impl/TicketServiceImpl.java
View file @
96185e71
package
com.viettel.campaign.service.impl
;
package
com.viettel.campaign.service.impl
;
import
com.viettel.campaign.repository.TicketRepository
;
import
com.viettel.campaign.config.DataSourceQualify
;
import
com.viettel.campaign.repository.ccms_full.TicketRepository
;
import
com.viettel.campaign.service.TicketService
;
import
com.viettel.campaign.service.TicketService
;
import
com.viettel.campaign.web.dto.TicketDTO
;
import
com.viettel.campaign.web.dto.TicketDTO
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.data.domain.PageRequest
;
import
org.springframework.data.domain.PageRequest
;
import
org.springframework.data.domain.Sort
;
import
org.springframework.data.domain.Sort
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.HashMap
;
import
java.util.HashMap
;
...
@@ -19,7 +21,8 @@ public class TicketServiceImpl implements TicketService {
...
@@ -19,7 +21,8 @@ public class TicketServiceImpl implements TicketService {
@Autowired
@Autowired
TicketRepository
ticketRepository
;
TicketRepository
ticketRepository
;
@Override
@Override
@Transactional
(
DataSourceQualify
.
CCMS_FULL
)
public
Map
getHistory
(
int
page
,
int
pageSize
,
String
sort
,
String
customerId
)
{
public
Map
getHistory
(
int
page
,
int
pageSize
,
String
sort
,
String
customerId
)
{
Map
result
=
new
HashMap
();
Map
result
=
new
HashMap
();
List
<
TicketDTO
>
lst
=
new
ArrayList
<>();
List
<
TicketDTO
>
lst
=
new
ArrayList
<>();
...
...
src/main/java/com/viettel/campaign/web/rest/ApParamController.java
View file @
96185e71
package
com.viettel.campaign.web.rest
;
package
com.viettel.campaign.web.rest
;
import
com.viettel.campaign.model.ApParam
;
import
com.viettel.campaign.model.
ccms_full.
ApParam
;
import
com.viettel.campaign.service.ApParamService
;
import
com.viettel.campaign.service.ApParamService
;
import
com.viettel.campaign.service.CampaignExecuteService
;
import
com.viettel.campaign.service.CampaignExecuteService
;
import
org.apache.log4j.Logger
;
import
org.apache.log4j.Logger
;
...
...
src/main/resources/application.yml
View file @
96185e71
...
@@ -8,6 +8,13 @@ spring:
...
@@ -8,6 +8,13 @@ spring:
url
:
jdbc:oracle:thin:@10.60.157.135:1521:vt
url
:
jdbc:oracle:thin:@10.60.157.135:1521:vt
username
:
CCMS_FULL
username
:
CCMS_FULL
password
:
CCMS_FULL#123
password
:
CCMS_FULL#123
max_pool_size
:
32
datasource2
:
driver-class-name
:
oracle.jdbc.driver.OracleDriver
url
:
jdbc:oracle:thin:@10.60.157.135:1521:vt
username
:
CCMS_FULL
password
:
CCMS_FULL#123
max_pool_size
:
32
jpa
:
jpa
:
database-platform
:
org.hibernate.dialect.Oracle10gDialect
database-platform
:
org.hibernate.dialect.Oracle10gDialect
show-sql
:
true
show-sql
:
true
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment