diff --git a/contact-center/app/src/main/java/com/chatopera/cc/app/schedule/CallOutPlanTask.java b/contact-center/app/src/main/java/com/chatopera/cc/app/schedule/CallOutPlanTask.java index d01cb8e7..ae81a8fb 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/app/schedule/CallOutPlanTask.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/app/schedule/CallOutPlanTask.java @@ -91,20 +91,22 @@ public class CallOutPlanTask { @Scheduled(fixedDelayString = "${cskefu.callout.watch.interval}") // 每分钟执行一次 public void watch() { - logger.debug("[callout executor] check dialplan job running status ..."); - // load all jobs - List dps = callOutDialplanRes.findByStatusAndIsarchive(MainContext.CallOutDialplanStatusEnum.RUNNING.toString(), false); - for (CallOutDialplan dp : dps) { - Long size = redisListOps.size(String.format(Constants.FS_DIALPLAN_TARGET, dp.getVoicechannel().getBaseURL(), dp.getId())); - if (size > 0) { - logger.info("[callout executor] job [{}] is not done yet, remaining [{}]", dp.getName(), size); - } else { - dp.setStatus(MainContext.CallOutDialplanStatusEnum.STOPPED.toString()); - dp.setUpdatetime(new Date()); - callOutDialplanRes.save(dp); + if(MainContext.isEnableCalloutModule()){ + logger.debug("[callout executor] check dialplan job running status ..."); + // load all jobs + List dps = callOutDialplanRes.findByStatusAndIsarchive(MainContext.CallOutDialplanStatusEnum.RUNNING.toString(), false); + for (CallOutDialplan dp : dps) { + Long size = redisListOps.size(String.format(Constants.FS_DIALPLAN_TARGET, dp.getVoicechannel().getBaseURL(), dp.getId())); + if (size > 0) { + logger.info("[callout executor] job [{}] is not done yet, remaining [{}]", dp.getName(), size); + } else { + dp.setStatus(MainContext.CallOutDialplanStatusEnum.STOPPED.toString()); + 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()); + } } } } diff --git a/contact-center/app/src/main/resources/templates/admin/user/index.html b/contact-center/app/src/main/resources/templates/admin/user/index.html index 96223322..321e62bd 100644 --- a/contact-center/app/src/main/resources/templates/admin/user/index.html +++ b/contact-center/app/src/main/resources/templates/admin/user/index.html @@ -9,6 +9,7 @@
+

提示:除管理员外,账号必须在【组织结构】中关联一个部门,必须在【系统角色】中关联一个角色,才可以使用资源。设置后,该账号需重新登系统才能生效。