github/cosin
1
0
Fork 0
mirror of https://github.com/chatopera/cosin.git synced 2025-08-01 16:38:02 +08:00
Code Issues Releases Wiki Activity

#83 add notice in user list

Browse Source
This commit is contained in:
Hai Liang Wang 2018-10-20 17:26:35 +08:00
parent 4914541afb
commit b914c0d5b8
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
contact-center/app/src/main/java/com/chatopera/cc/app/schedule/CallOutPlanTask.java
View File

@ -91,20 +91,22 @@ public class CallOutPlanTask {
@Scheduled(fixedDelayString = "${cskefu.callout.watch.interval}") // 每分钟执行一次 @Scheduled(fixedDelayString = "${cskefu.callout.watch.interval}") // 每分钟执行一次
public void watch() { public void watch() {
logger.debug("[callout executor] check dialplan job running status ..."); if(MainContext.isEnableCalloutModule()){
// load all jobs logger.debug("[callout executor] check dialplan job running status ...");
List<CallOutDialplan> dps = callOutDialplanRes.findByStatusAndIsarchive(MainContext.CallOutDialplanStatusEnum.RUNNING.toString(), false); // load all jobs
for (CallOutDialplan dp : dps) { List<CallOutDialplan> dps = callOutDialplanRes.findByStatusAndIsarchive(MainContext.CallOutDialplanStatusEnum.RUNNING.toString(), false);
Long size = redisListOps.size(String.format(Constants.FS_DIALPLAN_TARGET, dp.getVoicechannel().getBaseURL(), dp.getId())); for (CallOutDialplan dp : dps) {
if (size > 0) { Long size = redisListOps.size(String.format(Constants.FS_DIALPLAN_TARGET, dp.getVoicechannel().getBaseURL(), dp.getId()));
logger.info("[callout executor] job [{}] is not done yet, remaining [{}]", dp.getName(), size); if (size > 0) {
} else { logger.info("[callout executor] job [{}] is not done yet, remaining [{}]", dp.getName(), size);
dp.setStatus(MainContext.CallOutDialplanStatusEnum.STOPPED.toString()); } else {
dp.setUpdatetime(new Date()); dp.setStatus(MainContext.CallOutDialplanStatusEnum.STOPPED.toString());
callOutDialplanRes.save(dp); dp.setUpdatetime(new Date());
callOutDialplanRes.save(dp);
// 删除状态成员 // 删除状态成员
delHashKey(String.format(Constants.FS_DIALPLAN_STATUS, dp.getVoicechannel().getBaseURL()), dp.getId()); delHashKey(String.format(Constants.FS_DIALPLAN_STATUS, dp.getVoicechannel().getBaseURL()), dp.getId());
}
} }
} }
} }

1
contact-center/app/src/main/resources/templates/admin/user/index.html
View File

@ -9,6 +9,7 @@
</span> </span>
</h1> </h1>
<div class="row" style="padding:5px;"> <div class="row" style="padding:5px;">
<p style="color:red">提示：除管理员外，账号必须在【组织结构】中关联一个部门，必须在【系统角色】中关联一个角色，才可以使用资源。设置后，该账号需重新登系统才能生效。</p>
<div class="col-lg-12"> <div class="col-lg-12">
<table class="layui-table" lay-skin="line"> <table class="layui-table" lay-skin="line">
<colgroup> <colgroup>