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
2ab1d4c6
Commit
2ab1d4c6
authored
Aug 12, 2019
by
Vu Duy Anh
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
anhvd commit acd package
parent
54d67635
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
48 additions
and
1 deletion
+48
-1
src/main/java/com/viettel/campaign/model/acd_full/modeltest.java
...n/java/com/viettel/campaign/model/acd_full/modeltest.java
+7
-0
src/main/java/com/viettel/campaign/repository/acd_full/acdrepotest.java
...com/viettel/campaign/repository/acd_full/acdrepotest.java
+7
-0
src/main/java/com/viettel/campaign/repository/ccms_full/TimeRangeDialModeRepository.java
...ign/repository/ccms_full/TimeRangeDialModeRepository.java
+3
-0
src/main/java/com/viettel/campaign/repository/ccms_full/TimeZoneDialModeRepository.java
...aign/repository/ccms_full/TimeZoneDialModeRepository.java
+3
-0
src/main/java/com/viettel/campaign/service/CampaignService.java
...in/java/com/viettel/campaign/service/CampaignService.java
+6
-0
src/main/java/com/viettel/campaign/web/rest/CampaignController.java
...ava/com/viettel/campaign/web/rest/CampaignController.java
+22
-1
No files found.
src/main/java/com/viettel/campaign/model/acd_full/modeltest.java
0 → 100644
View file @
2ab1d4c6
package
com.viettel.campaign.model.acd_full
;
/**
* @author anhvd_itsol
*/
public
class
modeltest
{
}
src/main/java/com/viettel/campaign/repository/acd_full/acdrepotest.java
0 → 100644
View file @
2ab1d4c6
package
com.viettel.campaign.repository.acd_full
;
/**
* @author anhvd_itsol
*/
public
class
acdrepotest
{
}
src/main/java/com/viettel/campaign/repository/ccms_full/TimeRangeDialModeRepository.java
View file @
2ab1d4c6
...
...
@@ -4,10 +4,13 @@ import com.viettel.campaign.model.ccms_full.TimeRangeDialMode;
import
org.springframework.data.jpa.repository.JpaRepository
;
import
org.springframework.stereotype.Repository
;
import
java.util.List
;
/**
* @author anhvd_itsol
*/
@Repository
public
interface
TimeRangeDialModeRepository
extends
JpaRepository
<
TimeRangeDialMode
,
Long
>
{
List
<
TimeRangeDialMode
>
findTimeRangeDialModeByCampaignIdAndCompanySiteId
(
Long
campaignId
,
Long
companySiteId
);
}
src/main/java/com/viettel/campaign/repository/ccms_full/TimeZoneDialModeRepository.java
View file @
2ab1d4c6
...
...
@@ -4,10 +4,13 @@ import com.viettel.campaign.model.ccms_full.TimeZoneDialMode;
import
org.springframework.data.jpa.repository.JpaRepository
;
import
org.springframework.stereotype.Repository
;
import
java.util.List
;
/**
* @author anhvd_itsol
*/
@Repository
public
interface
TimeZoneDialModeRepository
extends
JpaRepository
<
TimeZoneDialMode
,
Long
>
{
List
<
TimeZoneDialMode
>
findTimeZoneDialModeByCampaignIdAndCompanySiteId
(
Long
campaignId
,
Long
companySiteId
);
}
src/main/java/com/viettel/campaign/service/CampaignService.java
View file @
2ab1d4c6
package
com.viettel.campaign.service
;
import
com.viettel.campaign.model.ccms_full.Campaign
;
import
com.viettel.campaign.model.ccms_full.TimeRangeDialMode
;
import
com.viettel.campaign.model.ccms_full.TimeZoneDialMode
;
import
com.viettel.campaign.web.dto.CampaignDTO
;
import
com.viettel.campaign.web.dto.ResultDTO
;
import
com.viettel.campaign.web.dto.request_dto.CampaignRequestDTO
;
...
...
@@ -38,4 +40,8 @@ public interface CampaignService {
ResultDTO
checkAllowStatusToPrepare
(
Long
campaignId
);
XSSFWorkbook
exportCampaigns
(
CampaignRequestDTO
dto
);
List
<
TimeRangeDialMode
>
getCampaignTimeRangeMode
(
Long
campaignId
,
Long
companySiteId
);
List
<
TimeZoneDialMode
>
getCampaignTimeZoneMode
(
Long
campaignId
,
Long
companySiteId
);
}
src/main/java/com/viettel/campaign/web/rest/CampaignController.java
View file @
2ab1d4c6
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.repository.ccms_full.TimeRangeDialModeRepository
;
import
com.viettel.campaign.repository.ccms_full.TimeZoneDialModeRepository
;
import
com.viettel.campaign.service.CampaignExecuteService
;
import
com.viettel.campaign.service.CampaignService
;
import
com.viettel.campaign.web.dto.CampaignDTO
;
...
...
@@ -9,7 +13,6 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.cloud.sleuth.instrument.reactor.ReactorSleuth
;
import
org.springframework.http.HttpHeaders
;
import
org.springframework.http.HttpStatus
;
import
org.springframework.http.MediaType
;
...
...
@@ -21,6 +24,7 @@ import javax.servlet.http.HttpServletResponse;
import
java.io.ByteArrayOutputStream
;
import
java.io.IOException
;
import
java.io.OutputStream
;
import
java.util.List
;
import
java.util.Map
;
@RestController
...
...
@@ -36,6 +40,12 @@ public class CampaignController {
@Autowired
CampaignExecuteService
campaignExecuteService
;
@Autowired
TimeRangeDialModeRepository
timeRangeDialModeRepository
;
@Autowired
TimeZoneDialModeRepository
timeZoneDialModeRepository
;
@PostMapping
(
"/searchCampaignExecute"
)
@ResponseBody
public
ResponseEntity
<
ResultDTO
>
searchCampaignExecute
(
@RequestBody
CampaignRequestDTO
requestDto
)
{
...
...
@@ -154,4 +164,15 @@ public class CampaignController {
headers
.
setContentType
(
MediaType
.
parseMediaType
(
"application/vnd.ms-excel"
));
return
new
ResponseEntity
<
byte
[]>(
contentReturn
,
headers
,
HttpStatus
.
OK
);
}
@RequestMapping
(
value
=
"/findCampaignTimeRangeMode"
,
method
=
RequestMethod
.
GET
)
public
List
<
TimeRangeDialMode
>
findCampaignTimeRangeMode
(
@RequestParam
Long
campaignId
,
@RequestParam
Long
companySiteId
)
{
return
timeRangeDialModeRepository
.
findTimeRangeDialModeByCampaignIdAndCompanySiteId
(
campaignId
,
companySiteId
);
}
@RequestMapping
(
value
=
"/findCampaignTimeZoneMode"
,
method
=
RequestMethod
.
GET
)
public
List
<
TimeZoneDialMode
>
findCampaignTimeZoneMode
(
@RequestParam
Long
campaignId
,
@RequestParam
Long
companySiteId
)
{
return
timeZoneDialModeRepository
.
findTimeZoneDialModeByCampaignIdAndCompanySiteId
(
campaignId
,
companySiteId
);
}
}
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