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
248e5ca3
Commit
248e5ca3
authored
Aug 09, 2019
by
Vu Duy Anh
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
anhvd commit change
parent
95438a14
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
170 additions
and
6 deletions
+170
-6
src/main/java/com/viettel/campaign/repository/UserActionLogRepositoryCustom.java
...el/campaign/repository/UserActionLogRepositoryCustom.java
+13
-0
src/main/java/com/viettel/campaign/repository/impl/UserActionLogRepositoryImpl.java
...campaign/repository/impl/UserActionLogRepositoryImpl.java
+59
-0
src/main/java/com/viettel/campaign/service/UserActionLogService.java
...va/com/viettel/campaign/service/UserActionLogService.java
+8
-0
src/main/java/com/viettel/campaign/service/impl/CampaignServiceImpl.java
...om/viettel/campaign/service/impl/CampaignServiceImpl.java
+29
-4
src/main/java/com/viettel/campaign/service/impl/UserActionLogServiceImpl.java
...ettel/campaign/service/impl/UserActionLogServiceImpl.java
+14
-0
src/main/java/com/viettel/campaign/web/dto/CampaignDTO.java
src/main/java/com/viettel/campaign/web/dto/CampaignDTO.java
+1
-0
src/main/java/com/viettel/campaign/web/dto/UserActionLogDTO.java
...n/java/com/viettel/campaign/web/dto/UserActionLogDTO.java
+23
-0
src/main/java/com/viettel/campaign/web/rest/controller/CampaignController.java
...ttel/campaign/web/rest/controller/CampaignController.java
+5
-2
src/main/resources/sql/campaign-mng/insert-to-user-action-log.sql
.../resources/sql/campaign-mng/insert-to-user-action-log.sql
+18
-0
No files found.
src/main/java/com/viettel/campaign/repository/UserActionLogRepositoryCustom.java
0 → 100644
View file @
248e5ca3
package
com.viettel.campaign.repository
;
import
com.viettel.campaign.web.dto.ResultDTO
;
import
com.viettel.campaign.web.dto.UserActionLogDTO
;
/**
* @author anhvd_itsol
*/
public
interface
UserActionLogRepositoryCustom
{
ResultDTO
insertToUserActionLog
(
UserActionLogDTO
userActionLogDTO
);
}
src/main/java/com/viettel/campaign/repository/impl/UserActionLogRepositoryImpl.java
0 → 100644
View file @
248e5ca3
package
com.viettel.campaign.repository.impl
;
import
com.viettel.campaign.repository.UserActionLogRepositoryCustom
;
import
com.viettel.campaign.utils.Constants
;
import
com.viettel.campaign.utils.HibernateUtil
;
import
com.viettel.campaign.utils.SQLBuilder
;
import
com.viettel.campaign.web.dto.ResultDTO
;
import
com.viettel.campaign.web.dto.UserActionLogDTO
;
import
org.apache.logging.log4j.LogManager
;
import
org.apache.logging.log4j.Logger
;
import
org.hibernate.SQLQuery
;
import
org.hibernate.Session
;
import
org.hibernate.SessionFactory
;
import
org.springframework.stereotype.Repository
;
import
org.springframework.transaction.annotation.Transactional
;
/**
* @author anhvd_itsol
*/
@Repository
@Transactional
public
class
UserActionLogRepositoryImpl
implements
UserActionLogRepositoryCustom
{
private
static
final
Logger
logger
=
LogManager
.
getLogger
(
CampaignRepositoryImpl
.
class
);
@Override
public
ResultDTO
insertToUserActionLog
(
UserActionLogDTO
userActionLogDTO
)
{
logger
.
info
(
"Start search campaign::"
);
ResultDTO
result
=
new
ResultDTO
();
SessionFactory
sessionFactory
=
HibernateUtil
.
getSessionFactory
();
Session
session
=
sessionFactory
.
openSession
();
session
.
beginTransaction
();
try
{
StringBuilder
sqlStr
=
new
StringBuilder
();
sqlStr
.
append
(
SQLBuilder
.
getSqlQueryById
(
SQLBuilder
.
SQL_MODULE_CAMPAIGN_MNG
,
"insert-to-user-action-log"
));
SQLQuery
query
=
session
.
createSQLQuery
(
sqlStr
.
toString
());
query
.
setParameter
(
"par_agentId"
,
userActionLogDTO
.
getAgentId
()
==
null
?
""
:
userActionLogDTO
.
getAgentId
());
query
.
setParameter
(
"par_companySiteId"
,
userActionLogDTO
.
getCompanySiteId
());
query
.
setParameter
(
"par_sessionId"
,
userActionLogDTO
.
getSessionId
());
query
.
setParameter
(
"par_startTime"
,
userActionLogDTO
.
getStartTime
());
query
.
setParameter
(
"par_actionType"
,
userActionLogDTO
.
getActionType
());
query
.
setParameter
(
"par_objectId"
,
userActionLogDTO
.
getObjectId
());
query
.
executeUpdate
();
result
.
setErrorCode
(
Constants
.
ApiErrorCode
.
SUCCESS
);
result
.
setDescription
(
Constants
.
ApiErrorDesc
.
SUCCESS
);
}
catch
(
Exception
ex
)
{
logger
.
error
(
ex
.
getMessage
(),
ex
);
result
.
setErrorCode
(
Constants
.
ApiErrorCode
.
ERROR
);
result
.
setDescription
(
Constants
.
ApiErrorDesc
.
ERROR
);
}
finally
{
session
.
close
();
}
return
result
;
}
}
src/main/java/com/viettel/campaign/service/UserActionLogService.java
0 → 100644
View file @
248e5ca3
package
com.viettel.campaign.service
;
/**
* @author anhvd_itsol
*/
public
interface
UserActionLogService
{
}
src/main/java/com/viettel/campaign/service/impl/CampaignServiceImpl.java
View file @
248e5ca3
...
@@ -3,16 +3,16 @@ package com.viettel.campaign.service.impl;
...
@@ -3,16 +3,16 @@ package com.viettel.campaign.service.impl;
import
com.viettel.campaign.model.Campaign
;
import
com.viettel.campaign.model.Campaign
;
import
com.viettel.campaign.model.TimeRangeDialMode
;
import
com.viettel.campaign.model.TimeRangeDialMode
;
import
com.viettel.campaign.model.TimeZoneDialMode
;
import
com.viettel.campaign.model.TimeZoneDialMode
;
//import com.viettel.campaign.model.UserActionLog;
import
com.viettel.campaign.repository.CampaignRepository
;
import
com.viettel.campaign.repository.CampaignRepository
;
import
com.viettel.campaign.repository.TimeRangeDialModeRepository
;
import
com.viettel.campaign.repository.TimeRangeDialModeRepository
;
import
com.viettel.campaign.repository.TimeZoneDialModeRepository
;
import
com.viettel.campaign.repository.TimeZoneDialModeRepository
;
//import com.viettel.campaign.repository.UserActionLogRepository;
import
com.viettel.campaign.repository.UserActionLogRepositoryCustom
;
import
com.viettel.campaign.repository.impl.CampaignRepositoryImpl
;
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.CampaignDTO
;
import
com.viettel.campaign.web.dto.*
;
import
com.viettel.campaign.web.dto.ResultDTO
;
import
com.viettel.campaign.web.dto.TimeRangeDialModeDTO
;
import
com.viettel.campaign.web.dto.TimeZoneDialModeDTO
;
import
com.viettel.campaign.web.dto.request_dto.CampaignRequestDTO
;
import
com.viettel.campaign.web.dto.request_dto.CampaignRequestDTO
;
import
org.apache.logging.log4j.LogManager
;
import
org.apache.logging.log4j.LogManager
;
import
org.apache.logging.log4j.Logger
;
import
org.apache.logging.log4j.Logger
;
...
@@ -38,6 +38,9 @@ public class CampaignServiceImpl implements CampaignService {
...
@@ -38,6 +38,9 @@ public class CampaignServiceImpl implements CampaignService {
@Autowired
@Autowired
TimeRangeDialModeRepository
timeRangeDialModeRepository
;
TimeRangeDialModeRepository
timeRangeDialModeRepository
;
@Autowired
UserActionLogRepositoryCustom
userActionLogRepository
;
@Autowired
@Autowired
ModelMapper
modelMapper
;
ModelMapper
modelMapper
;
...
@@ -149,6 +152,28 @@ public class CampaignServiceImpl implements CampaignService {
...
@@ -149,6 +152,28 @@ public class CampaignServiceImpl implements CampaignService {
entity
.
setUpdateTime
(
new
Date
());
entity
.
setUpdateTime
(
new
Date
());
entity
.
setUpdateBy
(
dto
.
getUpdateBy
());
entity
.
setUpdateBy
(
dto
.
getUpdateBy
());
campaignRepository
.
save
(
entity
);
campaignRepository
.
save
(
entity
);
UserActionLogDTO
userActionLog
=
new
UserActionLogDTO
();
userActionLog
.
setAgentId
(
null
);
userActionLog
.
setSessionId
(
dto
.
getSessionId
());
userActionLog
.
setCompanySiteId
(
dto
.
getCompanySiteId
());
userActionLog
.
setDescription
(
null
);
userActionLog
.
setStartTime
(
new
Date
());
userActionLog
.
setEndTime
(
null
);
userActionLog
.
setObjectId
(
entity
.
getCampaignId
());
if
(
dto
.
getStatus
().
equals
((
short
)
-
1
))
{
userActionLog
.
setActionType
((
short
)
2
);
}
else
if
(
dto
.
getStatus
().
equals
((
short
)
5
))
{
userActionLog
.
setActionType
((
short
)
7
);
}
else
if
(
dto
.
getStatus
().
equals
((
short
)
4
))
{
userActionLog
.
setActionType
((
short
)
4
);
}
else
if
(
dto
.
getStatus
().
equals
((
short
)
3
))
{
userActionLog
.
setActionType
((
short
)
5
);
}
userActionLogRepository
.
insertToUserActionLog
(
userActionLog
);
result
.
setData
(
entity
);
result
.
setData
(
entity
);
result
.
setDescription
(
Constants
.
ApiErrorDesc
.
SUCCESS
);
result
.
setDescription
(
Constants
.
ApiErrorDesc
.
SUCCESS
);
result
.
setErrorCode
(
Constants
.
ApiErrorCode
.
SUCCESS
);
result
.
setErrorCode
(
Constants
.
ApiErrorCode
.
SUCCESS
);
...
...
src/main/java/com/viettel/campaign/service/impl/UserActionLogServiceImpl.java
0 → 100644
View file @
248e5ca3
package
com.viettel.campaign.service.impl
;
import
com.viettel.campaign.service.UserActionLogService
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
/**
* @author anhvd_itsol
*/
@Service
@Transactional
(
rollbackFor
=
Exception
.
class
)
public
class
UserActionLogServiceImpl
implements
UserActionLogService
{
}
src/main/java/com/viettel/campaign/web/dto/CampaignDTO.java
View file @
248e5ca3
...
@@ -64,4 +64,5 @@ public class CampaignDTO extends BaseDTO {
...
@@ -64,4 +64,5 @@ public class CampaignDTO extends BaseDTO {
private
List
<
TimeRangeDialModeDTO
>
lstTimeRange
;
private
List
<
TimeRangeDialModeDTO
>
lstTimeRange
;
private
List
<
TimeZoneDialModeDTO
>
lstTimeZone
;
private
List
<
TimeZoneDialModeDTO
>
lstTimeZone
;
private
Short
agentStatus
;
private
Short
agentStatus
;
private
String
sessionId
;
}
}
src/main/java/com/viettel/campaign/web/dto/UserActionLogDTO.java
0 → 100644
View file @
248e5ca3
package
com.viettel.campaign.web.dto
;
import
lombok.Getter
;
import
lombok.Setter
;
import
java.util.Date
;
/**
* @author anhvd_itsol
*/
@Getter
@Setter
public
class
UserActionLogDTO
{
private
Long
agentId
;
//userId
private
Long
companySiteId
;
private
String
sessionId
;
private
Date
startTime
;
private
Date
endTime
;
private
Short
actionType
;
private
String
description
;
private
Long
objectId
;
//campaignId
}
src/main/java/com/viettel/campaign/web/rest/controller/CampaignController.java
View file @
248e5ca3
...
@@ -12,6 +12,8 @@ import org.springframework.http.HttpStatus;
...
@@ -12,6 +12,8 @@ import org.springframework.http.HttpStatus;
import
org.springframework.http.ResponseEntity
;
import
org.springframework.http.ResponseEntity
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.*
;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpSession
;
import
java.util.Map
;
import
java.util.Map
;
@RestController
@RestController
...
@@ -70,8 +72,9 @@ public class CampaignController {
...
@@ -70,8 +72,9 @@ public class CampaignController {
return
new
ResponseEntity
<>(
resultDTO
,
HttpStatus
.
OK
);
return
new
ResponseEntity
<>(
resultDTO
,
HttpStatus
.
OK
);
}
}
@PostMapping
(
"/changeCampaignStatus"
)
@RequestMapping
(
value
=
"/changeCampaignStatus"
,
method
=
RequestMethod
.
PUT
)
public
ResultDTO
changeCampaignStatus
(
@RequestBody
CampaignDTO
dto
)
{
public
ResultDTO
changeCampaignStatus
(
@RequestBody
CampaignDTO
dto
,
HttpServletRequest
request
)
{
dto
.
setSessionId
(
request
.
getSession
().
getId
());
return
campaignService
.
changeCampaignStatus
(
dto
);
return
campaignService
.
changeCampaignStatus
(
dto
);
}
}
}
}
src/main/resources/sql/campaign-mng/insert-to-user-action-log.sql
0 → 100644
View file @
248e5ca3
INSERT
INTO
"CCMS_FULL"
.
"USER_ACTION_LOG"
(
AGENT_ID
,
COMPANY_SITE_ID
,
SESSION_ID
,
START_TIME
,
END_TIME
,
ACTION_TYPE
,
DESCRIPTION
,
OBJECT_ID
)
VALUES
(
:
par_agentId
,
:
par_companySiteId
,
:
par_sessionId
,
:
par_startTime
,
null
,
:
par_actionType
,
null
,
:
par_objectId
)
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