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
82aa6513
Commit
82aa6513
authored
Sep 04, 2019
by
=
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
hungtt-commit fix bug 393
parent
c8ec9274
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
49 additions
and
12 deletions
+49
-12
src/main/java/com/viettel/campaign/repository/ccms_full/CampaignRepositoryCustom.java
...mpaign/repository/ccms_full/CampaignRepositoryCustom.java
+3
-1
src/main/java/com/viettel/campaign/repository/ccms_full/impl/CampaignRepositoryImpl.java
...ign/repository/ccms_full/impl/CampaignRepositoryImpl.java
+18
-0
src/main/java/com/viettel/campaign/service/CampaignService.java
...in/java/com/viettel/campaign/service/CampaignService.java
+2
-1
src/main/java/com/viettel/campaign/service/impl/CampaignServiceImpl.java
...om/viettel/campaign/service/impl/CampaignServiceImpl.java
+17
-0
src/main/java/com/viettel/campaign/web/rest/CampaignController.java
...ava/com/viettel/campaign/web/rest/CampaignController.java
+9
-10
No files found.
src/main/java/com/viettel/campaign/repository/ccms_full/CampaignRepositoryCustom.java
View file @
82aa6513
package
com.viettel.campaign.repository.ccms_full
;
import
com.viettel.campaign.web.dto.
Campaign
DTO
;
import
com.viettel.campaign.web.dto.
ApParam
DTO
;
import
com.viettel.campaign.web.dto.ResultDTO
;
import
com.viettel.campaign.web.dto.request_dto.CampaignRequestDTO
;
import
org.springframework.stereotype.Repository
;
...
...
@@ -36,5 +36,7 @@ public interface CampaignRepositoryCustom {
ResultDTO
getCampaignCustomerInformation
(
CampaignRequestDTO
dto
);
ResultDTO
getCustomerListInformation
(
CampaignRequestDTO
dto
);
List
<
ApParamDTO
>
getConnectStatus
(
Long
companySiteId
);
//</editor-fold>
}
src/main/java/com/viettel/campaign/repository/ccms_full/impl/CampaignRepositoryImpl.java
View file @
82aa6513
...
...
@@ -994,4 +994,22 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
return
resultDTO
;
}
@Override
@Transactional
(
DataSourceQualify
.
CCMS_FULL
)
public
List
<
ApParamDTO
>
getConnectStatus
(
Long
companySiteId
)
{
List
<
ApParamDTO
>
list
=
new
ArrayList
<>();
Map
<
String
,
Object
>
params
=
new
HashMap
<>();
try
{
StringBuilder
sb
=
new
StringBuilder
();
sb
.
append
(
" select complete_value apParamId, complete_name parName "
);
sb
.
append
(
" from campaign_complete_code "
);
sb
.
append
(
" where complete_type = 1 and complete_value <> 1 and company_site_id = :p_company_site_id"
);
params
.
put
(
"p_company_site_id"
,
companySiteId
);
list
=
namedParameterJdbcTemplate
.
query
(
sb
.
toString
(),
params
,
BeanPropertyRowMapper
.
newInstance
(
ApParamDTO
.
class
));
}
catch
(
Exception
e
)
{
logger
.
error
(
e
.
getMessage
(),
e
);
}
return
list
;
}
}
src/main/java/com/viettel/campaign/service/CampaignService.java
View file @
82aa6513
...
...
@@ -10,7 +10,6 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import
java.util.Date
;
import
java.util.List
;
import
java.util.Map
;
public
interface
CampaignService
{
...
...
@@ -72,6 +71,8 @@ public interface CampaignService {
ResultDTO
getCustomerListInformation
(
CampaignRequestDTO
dto
);
ResultDTO
saveCustomerCampaign
(
CampaignRequestDTO
dto
);
ResultDTO
getConnectStatus
(
Long
companySiteId
);
//</editor-fold>
}
src/main/java/com/viettel/campaign/service/impl/CampaignServiceImpl.java
View file @
82aa6513
...
...
@@ -676,6 +676,23 @@ public class CampaignServiceImpl implements CampaignService {
return
resultDTO
;
}
@Override
@Transactional
(
DataSourceQualify
.
CCMS_FULL
)
public
ResultDTO
getConnectStatus
(
Long
companySiteId
)
{
ResultDTO
resultDTO
=
new
ResultDTO
();
try
{
List
<
ApParamDTO
>
list
=
campaignRepositoryCustom
.
getConnectStatus
(
companySiteId
);
resultDTO
.
setListData
(
list
);
resultDTO
.
setErrorCode
(
Constants
.
ApiErrorCode
.
SUCCESS
);
resultDTO
.
setDescription
(
Constants
.
ApiErrorDesc
.
SUCCESS
);
}
catch
(
Exception
e
)
{
logger
.
error
(
e
.
getMessage
(),
e
);
resultDTO
.
setErrorCode
(
Constants
.
ApiErrorCode
.
ERROR
);
resultDTO
.
setDescription
(
Constants
.
ApiErrorDesc
.
ERROR
);
}
return
resultDTO
;
}
// hungtt
private
Map
<
String
,
String
>
setMapData
(
Map
<
String
,
String
>
mapColumn
,
Locale
locale
)
{
mapColumn
.
put
(
"CUSTOMER_ID"
,
BundleUtils
.
getLangString
(
"CUSTOMER_ID"
,
locale
));
...
...
src/main/java/com/viettel/campaign/web/rest/CampaignController.java
View file @
82aa6513
...
...
@@ -2,15 +2,10 @@ package com.viettel.campaign.web.rest;
import
com.viettel.campaign.model.ccms_full.TimeRangeDialMode
;
import
com.viettel.campaign.model.ccms_full.TimeZoneDialMode
;
import
com.viettel.campaign.service.CampaignExecuteService
;
import
com.viettel.campaign.service.CampaignService
;
import
com.viettel.campaign.utils.BundleUtils
;
import
com.viettel.campaign.utils.Constants
;
import
com.viettel.campaign.utils.RedisUtil
;
import
com.viettel.campaign.web.dto.*
;
import
com.viettel.campaign.web.dto.CampaignDTO
;
import
com.viettel.campaign.web.dto.ResultDTO
;
import
com.viettel.campaign.web.dto.request_dto.CampaignRequestDTO
;
import
com.viettel.econtact.filter.UserSession
;
import
org.apache.commons.io.FilenameUtils
;
import
org.apache.poi.xssf.usermodel.XSSFWorkbook
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
...
...
@@ -20,7 +15,6 @@ import org.springframework.http.HttpStatus;
import
org.springframework.http.MediaType
;
import
org.springframework.http.ResponseEntity
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.multipart.MultipartFile
;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpServletResponse
;
...
...
@@ -28,8 +22,6 @@ import java.io.ByteArrayOutputStream;
import
java.io.IOException
;
import
java.io.OutputStream
;
import
java.util.List
;
import
java.util.Locale
;
import
java.util.Objects
;
@RestController
@RequestMapping
(
"/ipcc/campaign"
)
...
...
@@ -227,4 +219,11 @@ public class CampaignController {
return
new
ResponseEntity
<>(
result
,
HttpStatus
.
OK
);
}
@GetMapping
(
"/getConnectStatus"
)
@ResponseBody
public
ResponseEntity
<
ResultDTO
>
getConnectStatus
(
@RequestParam
(
"companySiteId"
)
Long
companySiteId
)
{
ResultDTO
resultDTO
=
campaignService
.
getConnectStatus
(
companySiteId
);
return
new
ResponseEntity
<>(
resultDTO
,
HttpStatus
.
OK
);
}
}
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