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
b3c295a2
Commit
b3c295a2
authored
Aug 22, 2019
by
Nguyen Ha
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
write log from job
parent
e23ebd57
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
86 additions
and
9 deletions
+86
-9
src/main/java/com/viettel/campaign/job/CampaignJob.java
src/main/java/com/viettel/campaign/job/CampaignJob.java
+20
-8
src/main/java/com/viettel/campaign/model/ccms_full/UserActionLog.java
...a/com/viettel/campaign/model/ccms_full/UserActionLog.java
+48
-0
src/main/java/com/viettel/campaign/service/UserActionLogService.java
...va/com/viettel/campaign/service/UserActionLogService.java
+5
-1
src/main/java/com/viettel/campaign/service/impl/UserActionLogServiceImpl.java
...ettel/campaign/service/impl/UserActionLogServiceImpl.java
+13
-0
No files found.
src/main/java/com/viettel/campaign/job/CampaignJob.java
View file @
b3c295a2
package
com.viettel.campaign.job
;
import
com.viettel.campaign.model.ccms_full.Campaign
;
import
com.viettel.campaign.model.ccms_full.Customer
;
import
com.viettel.campaign.model.ccms_full.CustomerTime
;
import
com.viettel.campaign.model.ccms_full.ProcessConfig
;
import
com.viettel.campaign.service.CampaignService
;
import
com.viettel.campaign.service.CustomerService
;
import
com.viettel.campaign.service.CustomerTimeService
;
import
com.viettel.campaign.service.ProcessConfigService
;
import
com.viettel.campaign.model.ccms_full.*
;
import
com.viettel.campaign.service.*
;
import
com.viettel.campaign.utils.DateTimeUtil
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
...
@@ -42,6 +36,9 @@ public class CampaignJob {
@Autowired
private
CustomerService
customerService
;
@Autowired
private
UserActionLogService
userActionLogService
;
// @Scheduled(fixedRate = 5000)
// @Transactional( propagation = Propagation.REQUIRED)
public
void
process
()
{
...
...
@@ -74,6 +71,8 @@ public class CampaignJob {
campaign
.
setStatus
(
2L
);
campaign
.
setCampaignStart
(
new
Date
());
campaignService
.
updateProcess
(
campaign
);
//write log
saveLog
(
campaign
,
1
);
});
log
.
info
(
"Cap nhat thoi gian thuc hien tien trinh cho siteId ... #{}"
,
p
.
getSiteId
());
...
...
@@ -93,6 +92,8 @@ public class CampaignJob {
campaign
.
setStatus
(
4L
);
campaign
.
setCampaignEnd
(
new
Date
());
campaignService
.
updateProcess
(
campaign
);
//write log
saveLog
(
campaign
,
2
);
});
log
.
info
(
"Cap nhat thoi gian thuc hien tien trinh cho siteId ... #{}"
,
p
.
getSiteId
());
...
...
@@ -129,5 +130,16 @@ public class CampaignJob {
});
}
private
void
saveLog
(
Campaign
c
,
int
t
){
UserActionLog
log
=
new
UserActionLog
();
log
.
setAgentId
(
1L
);
log
.
setSessionId
(
"-1"
);
log
.
setStartTime
(
new
Date
());
log
.
setActionType
(
t
==
1
?
13L
:
14L
);
log
.
setObjectId
(
c
.
getCampaignId
());
log
.
setCompanySiteId
(
c
.
getCompanySiteId
());
userActionLogService
.
save
(
log
);
}
}
src/main/java/com/viettel/campaign/model/ccms_full/UserActionLog.java
0 → 100644
View file @
b3c295a2
package
com.viettel.campaign.model.ccms_full
;
import
lombok.Data
;
import
javax.persistence.Column
;
import
javax.persistence.Entity
;
import
javax.persistence.Id
;
import
javax.persistence.Table
;
import
javax.validation.constraints.NotNull
;
import
java.io.Serializable
;
import
java.util.Date
;
/**
* @author hanv_itsol
* @project campaign
*/
@Entity
@Table
(
name
=
"USER_ACTION_LOG"
)
@Data
public
class
UserActionLog
implements
Serializable
{
@Id
@NotNull
@Column
(
name
=
"AGENT_ID"
)
private
Long
agentId
;
@Column
(
name
=
"COMPANY_SITE_ID"
)
private
Long
companySiteId
;
@Column
(
name
=
"SESSION_ID"
)
private
String
sessionId
;
@Column
(
name
=
"START_TIME"
)
private
Date
startTime
;
@Column
(
name
=
"END_TIME"
)
private
Date
endTime
;
@Column
(
name
=
"ACTION_TYPE"
)
private
Long
actionType
;
@Column
(
name
=
"DESCRIPTION"
)
private
String
description
;
@Column
(
name
=
"OBJECT_ID"
)
private
Long
objectId
;
}
src/main/java/com/viettel/campaign/service/UserActionLogService.java
View file @
b3c295a2
package
com.viettel.campaign.service
;
import
com.viettel.campaign.model.ccms_full.UserActionLog
;
/**
* @author anhvd_itsol
* @author hanv_itsol
* @project campaign
*/
public
interface
UserActionLogService
{
void
save
(
UserActionLog
log
);
}
src/main/java/com/viettel/campaign/service/impl/UserActionLogServiceImpl.java
View file @
b3c295a2
package
com.viettel.campaign.service.impl
;
import
com.viettel.campaign.config.DataSourceQualify
;
import
com.viettel.campaign.model.ccms_full.UserActionLog
;
import
com.viettel.campaign.repository.ccms_full.UserActionLogRepository
;
import
com.viettel.campaign.service.UserActionLogService
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
...
...
@@ -11,4 +15,13 @@ import org.springframework.transaction.annotation.Transactional;
@Service
@Transactional
(
rollbackFor
=
Exception
.
class
)
public
class
UserActionLogServiceImpl
implements
UserActionLogService
{
@Autowired
UserActionLogRepository
userActionLogRepository
;
@Override
@Transactional
(
DataSourceQualify
.
CCMS_FULL
)
public
void
save
(
UserActionLog
log
)
{
userActionLogRepository
.
save
(
log
);
}
}
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