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
706e8ba2
Commit
706e8ba2
authored
5 years ago
by
Tu Bach
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
7b52e677
Changes
20
Show whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
28 additions
and
32 deletions
+28
-32
service-campaign.iml
service-campaign.iml
+1
-0
src/main/java/com/viettel/campaign/controller/CampaignCompleteCodeController.java
...l/campaign/controller/CampaignCompleteCodeController.java
+2
-2
src/main/java/com/viettel/campaign/controller/CustomerController.java
...a/com/viettel/campaign/controller/CustomerController.java
+2
-3
src/main/java/com/viettel/campaign/dto/ApParamDTO.java
src/main/java/com/viettel/campaign/dto/ApParamDTO.java
+1
-1
src/main/java/com/viettel/campaign/dto/BaseDTO.java
src/main/java/com/viettel/campaign/dto/BaseDTO.java
+1
-1
src/main/java/com/viettel/campaign/dto/CampaignCompleteCodeDTO.java
...ava/com/viettel/campaign/dto/CampaignCompleteCodeDTO.java
+1
-1
src/main/java/com/viettel/campaign/dto/CustomerDTO.java
src/main/java/com/viettel/campaign/dto/CustomerDTO.java
+1
-1
src/main/java/com/viettel/campaign/dto/CustomerListDTO.java
src/main/java/com/viettel/campaign/dto/CustomerListDTO.java
+1
-1
src/main/java/com/viettel/campaign/dto/ResultDTO.java
src/main/java/com/viettel/campaign/dto/ResultDTO.java
+1
-1
src/main/java/com/viettel/campaign/dto/TicketSiteDTO.java
src/main/java/com/viettel/campaign/dto/TicketSiteDTO.java
+1
-1
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/BaseMapper.java
src/main/java/com/viettel/campaign/mapper/BaseMapper.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/CustomerMapper.java
...main/java/com/viettel/campaign/mapper/CustomerMapper.java
+1
-3
src/main/java/com/viettel/campaign/service/ApParamService.java
...ain/java/com/viettel/campaign/service/ApParamService.java
+2
-2
src/main/java/com/viettel/campaign/service/ApParamServiceImpl.java
...java/com/viettel/campaign/service/ApParamServiceImpl.java
+2
-2
src/main/java/com/viettel/campaign/service/CampaignCompleteCodeService.java
...viettel/campaign/service/CampaignCompleteCodeService.java
+2
-2
src/main/java/com/viettel/campaign/service/CampaignCompleteCodeServiceImpl.java
...tel/campaign/service/CampaignCompleteCodeServiceImpl.java
+2
-2
src/main/java/com/viettel/campaign/service/CustomerService.java
...in/java/com/viettel/campaign/service/CustomerService.java
+2
-4
src/main/java/com/viettel/campaign/service/CustomerServiceImpl.java
...ava/com/viettel/campaign/service/CustomerServiceImpl.java
+2
-2
No files found.
service-campaign.iml
View file @
706e8ba2
...
@@ -25,6 +25,7 @@
...
@@ -25,6 +25,7 @@
</content>
</content>
<orderEntry
type=
"jdk"
jdkName=
"1.8"
jdkType=
"JavaSDK"
/>
<orderEntry
type=
"jdk"
jdkName=
"1.8"
jdkType=
"JavaSDK"
/>
<orderEntry
type=
"sourceFolder"
forTests=
"false"
/>
<orderEntry
type=
"sourceFolder"
forTests=
"false"
/>
<orderEntry
type=
"library"
name=
"Maven: log4j:log4j:1.2.17"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.springframework.boot:spring-boot-starter-actuator:2.0.6.RELEASE"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.springframework.boot:spring-boot-starter-actuator:2.0.6.RELEASE"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.springframework.boot:spring-boot-starter:2.0.6.RELEASE"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.springframework.boot:spring-boot-starter:2.0.6.RELEASE"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.springframework.boot:spring-boot-starter-logging:2.0.6.RELEASE"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.springframework.boot:spring-boot-starter-logging:2.0.6.RELEASE"
level=
"project"
/>
...
...
This diff is collapsed.
Click to expand it.
src/main/java/com/viettel/campaign/controller/CampaignCompleteCodeController.java
View file @
706e8ba2
package
com.viettel.campaign.controller
;
package
com.viettel.campaign.controller
;
import
com.viettel.campaign.
DTO
.CampaignCompleteCodeDTO
;
import
com.viettel.campaign.
dto
.CampaignCompleteCodeDTO
;
import
com.viettel.campaign.
DTO
.ResultDTO
;
import
com.viettel.campaign.
dto
.ResultDTO
;
import
com.viettel.campaign.service.CampaignCompleteCodeService
;
import
com.viettel.campaign.service.CampaignCompleteCodeService
;
import
org.apache.log4j.Logger
;
import
org.apache.log4j.Logger
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
...
This diff is collapsed.
Click to expand it.
src/main/java/com/viettel/campaign/controller/CustomerController.java
View file @
706e8ba2
package
com.viettel.campaign.controller
;
package
com.viettel.campaign.controller
;
import
com.viettel.campaign.
DTO
.CustomerDTO
;
import
com.viettel.campaign.
dto
.CustomerDTO
;
import
com.viettel.campaign.
DTO
.ResultDTO
;
import
com.viettel.campaign.
dto
.ResultDTO
;
import
com.viettel.campaign.service.CustomerService
;
import
com.viettel.campaign.service.CustomerService
;
import
org.apache.log4j.Logger
;
import
org.apache.log4j.Logger
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
@@ -11,7 +11,6 @@ import org.springframework.stereotype.Controller;
...
@@ -11,7 +11,6 @@ import org.springframework.stereotype.Controller;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.*
;
import
javax.validation.Valid
;
import
javax.validation.Valid
;
import
java.util.Date
;
import
java.util.Map
;
import
java.util.Map
;
@Controller
@Controller
...
...
This diff is collapsed.
Click to expand it.
src/main/java/com/viettel/campaign/
DTO
/ApParamDTO.java
→
src/main/java/com/viettel/campaign/
dto
/ApParamDTO.java
View file @
706e8ba2
package
com.viettel.campaign.
DTO
;
package
com.viettel.campaign.
dto
;
public
class
ApParamDTO
extends
BaseDTO
{
public
class
ApParamDTO
extends
BaseDTO
{
...
...
This diff is collapsed.
Click to expand it.
src/main/java/com/viettel/campaign/
DTO
/BaseDTO.java
→
src/main/java/com/viettel/campaign/
dto
/BaseDTO.java
View file @
706e8ba2
package
com.viettel.campaign.
DTO
;
package
com.viettel.campaign.
dto
;
import
java.io.Serializable
;
import
java.io.Serializable
;
...
...
This diff is collapsed.
Click to expand it.
src/main/java/com/viettel/campaign/
DTO
/CampaignCompleteCodeDTO.java
→
src/main/java/com/viettel/campaign/
dto
/CampaignCompleteCodeDTO.java
View file @
706e8ba2
package
com.viettel.campaign.
DTO
;
package
com.viettel.campaign.
dto
;
import
java.util.Date
;
import
java.util.Date
;
...
...
This diff is collapsed.
Click to expand it.
src/main/java/com/viettel/campaign/
DTO
/CustomerDTO.java
→
src/main/java/com/viettel/campaign/
dto
/CustomerDTO.java
View file @
706e8ba2
package
com.viettel.campaign.
DTO
;
package
com.viettel.campaign.
dto
;
import
java.util.Date
;
import
java.util.Date
;
...
...
This diff is collapsed.
Click to expand it.
src/main/java/com/viettel/campaign/
DTO
/CustomerListDTO.java
→
src/main/java/com/viettel/campaign/
dto
/CustomerListDTO.java
View file @
706e8ba2
package
com.viettel.campaign.
DTO
;
package
com.viettel.campaign.
dto
;
public
class
CustomerListDTO
extends
BaseDTO
{
public
class
CustomerListDTO
extends
BaseDTO
{
...
...
This diff is collapsed.
Click to expand it.
src/main/java/com/viettel/campaign/
DTO
/ResultDTO.java
→
src/main/java/com/viettel/campaign/
dto
/ResultDTO.java
View file @
706e8ba2
package
com.viettel.campaign.
DTO
;
package
com.viettel.campaign.
dto
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.List
;
...
...
This diff is collapsed.
Click to expand it.
src/main/java/com/viettel/campaign/
DTO
/TicketSiteDTO.java
→
src/main/java/com/viettel/campaign/
dto
/TicketSiteDTO.java
View file @
706e8ba2
package
com.viettel.campaign.
DTO
;
package
com.viettel.campaign.
dto
;
import
java.util.Date
;
import
java.util.Date
;
...
...
This diff is collapsed.
Click to expand it.
src/main/java/com/viettel/campaign/mapper/ApParamMapper.java
View file @
706e8ba2
package
com.viettel.campaign.mapper
;
package
com.viettel.campaign.mapper
;
import
com.viettel.campaign.
DTO
.ApParamDTO
;
import
com.viettel.campaign.
dto
.ApParamDTO
;
import
com.viettel.campaign.model.ApParam
;
import
com.viettel.campaign.model.ApParam
;
public
class
ApParamMapper
extends
BaseMapper
<
ApParam
,
ApParamDTO
>
{
public
class
ApParamMapper
extends
BaseMapper
<
ApParam
,
ApParamDTO
>
{
...
...
This diff is collapsed.
Click to expand it.
src/main/java/com/viettel/campaign/mapper/BaseMapper.java
View file @
706e8ba2
package
com.viettel.campaign.mapper
;
package
com.viettel.campaign.mapper
;
import
com.viettel.campaign.
DTO
.BaseDTO
;
import
com.viettel.campaign.
dto
.BaseDTO
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.List
;
...
...
This diff is collapsed.
Click to expand it.
src/main/java/com/viettel/campaign/mapper/CampaignCompleteCodeMapper.java
View file @
706e8ba2
package
com.viettel.campaign.mapper
;
package
com.viettel.campaign.mapper
;
import
com.viettel.campaign.
DTO
.CampaignCompleteCodeDTO
;
import
com.viettel.campaign.
dto
.CampaignCompleteCodeDTO
;
import
com.viettel.campaign.model.CampaignCompleteCode
;
import
com.viettel.campaign.model.CampaignCompleteCode
;
public
class
CampaignCompleteCodeMapper
extends
BaseMapper
<
CampaignCompleteCode
,
CampaignCompleteCodeDTO
>
{
public
class
CampaignCompleteCodeMapper
extends
BaseMapper
<
CampaignCompleteCode
,
CampaignCompleteCodeDTO
>
{
...
...
This diff is collapsed.
Click to expand it.
src/main/java/com/viettel/campaign/mapper/CustomerMapper.java
View file @
706e8ba2
package
com.viettel.campaign.mapper
;
package
com.viettel.campaign.mapper
;
import
com.viettel.campaign.
DTO
.CustomerDTO
;
import
com.viettel.campaign.
dto
.CustomerDTO
;
import
com.viettel.campaign.model.Customer
;
import
com.viettel.campaign.model.Customer
;
import
java.util.Date
;
public
class
CustomerMapper
extends
BaseMapper
<
Customer
,
CustomerDTO
>
{
public
class
CustomerMapper
extends
BaseMapper
<
Customer
,
CustomerDTO
>
{
@Override
@Override
...
...
This diff is collapsed.
Click to expand it.
src/main/java/com/viettel/campaign/service/ApParamService.java
View file @
706e8ba2
package
com.viettel.campaign.service
;
package
com.viettel.campaign.service
;
import
com.viettel.campaign.
DTO
.ApParamDTO
;
import
com.viettel.campaign.
dto
.ApParamDTO
;
import
com.viettel.campaign.
DTO
.ResultDTO
;
import
com.viettel.campaign.
dto
.ResultDTO
;
import
com.viettel.campaign.model.ApParam
;
import
com.viettel.campaign.model.ApParam
;
import
java.util.List
;
import
java.util.List
;
...
...
This diff is collapsed.
Click to expand it.
src/main/java/com/viettel/campaign/service/ApParamServiceImpl.java
View file @
706e8ba2
package
com.viettel.campaign.service
;
package
com.viettel.campaign.service
;
import
com.viettel.campaign.
DTO
.ApParamDTO
;
import
com.viettel.campaign.
dto
.ApParamDTO
;
import
com.viettel.campaign.
DTO
.ResultDTO
;
import
com.viettel.campaign.
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.ApParam
;
import
com.viettel.campaign.repository.ApParamRepository
;
import
com.viettel.campaign.repository.ApParamRepository
;
...
...
This diff is collapsed.
Click to expand it.
src/main/java/com/viettel/campaign/service/CampaignCompleteCodeService.java
View file @
706e8ba2
package
com.viettel.campaign.service
;
package
com.viettel.campaign.service
;
import
com.viettel.campaign.
DTO
.CampaignCompleteCodeDTO
;
import
com.viettel.campaign.
dto
.CampaignCompleteCodeDTO
;
import
com.viettel.campaign.
DTO
.ResultDTO
;
import
com.viettel.campaign.
dto
.ResultDTO
;
import
java.util.Map
;
import
java.util.Map
;
...
...
This diff is collapsed.
Click to expand it.
src/main/java/com/viettel/campaign/service/CampaignCompleteCodeServiceImpl.java
View file @
706e8ba2
package
com.viettel.campaign.service
;
package
com.viettel.campaign.service
;
import
com.viettel.campaign.
DTO
.CampaignCompleteCodeDTO
;
import
com.viettel.campaign.
dto
.CampaignCompleteCodeDTO
;
import
com.viettel.campaign.
DTO
.ResultDTO
;
import
com.viettel.campaign.
dto
.ResultDTO
;
import
com.viettel.campaign.mapper.CampaignCompleteCodeMapper
;
import
com.viettel.campaign.mapper.CampaignCompleteCodeMapper
;
import
com.viettel.campaign.model.CampaignCompleteCode
;
import
com.viettel.campaign.model.CampaignCompleteCode
;
import
com.viettel.campaign.repository.CampaignCompleteCodeRepository
;
import
com.viettel.campaign.repository.CampaignCompleteCodeRepository
;
...
...
This diff is collapsed.
Click to expand it.
src/main/java/com/viettel/campaign/service/CustomerService.java
View file @
706e8ba2
package
com.viettel.campaign.service
;
package
com.viettel.campaign.service
;
import
com.viettel.campaign.DTO.CustomerDTO
;
import
com.viettel.campaign.dto.CustomerDTO
;
import
com.viettel.campaign.DTO.ResultDTO
;
import
com.viettel.campaign.dto.ResultDTO
;
import
com.viettel.campaign.model.Customer
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
public
interface
CustomerService
{
public
interface
CustomerService
{
...
...
This diff is collapsed.
Click to expand it.
src/main/java/com/viettel/campaign/service/CustomerServiceImpl.java
View file @
706e8ba2
package
com.viettel.campaign.service
;
package
com.viettel.campaign.service
;
import
com.viettel.campaign.
DTO
.CustomerDTO
;
import
com.viettel.campaign.
dto
.CustomerDTO
;
import
com.viettel.campaign.
DTO
.ResultDTO
;
import
com.viettel.campaign.
dto
.ResultDTO
;
import
com.viettel.campaign.mapper.CustomerMapper
;
import
com.viettel.campaign.mapper.CustomerMapper
;
import
com.viettel.campaign.model.Customer
;
import
com.viettel.campaign.model.Customer
;
import
com.viettel.campaign.repository.CustomerRepository
;
import
com.viettel.campaign.repository.CustomerRepository
;
...
...
This diff is collapsed.
Click to expand it.
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