|
|
@@ -47,8 +47,8 @@ public class DingTalkSubsTask {
|
|
|
/**
|
|
|
* 每日订阅提醒推送
|
|
|
*/
|
|
|
-// @Scheduled(cron="0 0 9 * * ? ")
|
|
|
- @Scheduled(fixedDelay = 300000, initialDelay = 10000)
|
|
|
+ @Scheduled(cron="0 0 9 * * ? ")
|
|
|
+// @Scheduled(fixedDelay = 300000, initialDelay = 10000)
|
|
|
public void pushSubsData() {
|
|
|
logger.info("pushSubsData-begin");
|
|
|
DataCenter dataCenter = DataCenter.INSTANCE;
|
|
|
@@ -57,7 +57,7 @@ public class DingTalkSubsTask {
|
|
|
DataSourceHolder.set(dataCenter);
|
|
|
try {
|
|
|
boolean pushFlag = uasConfigsService.checkEnable("sys","enableMSubsPush");
|
|
|
- System.out.println("pushFlag:"+pushFlag);
|
|
|
+// System.out.println("pushFlag:"+pushFlag);
|
|
|
logger.info("pushSubsData-pushFlag:"+String.valueOf(pushFlag));
|
|
|
if(!pushFlag){
|
|
|
return;
|
|
|
@@ -66,12 +66,7 @@ public class DingTalkSubsTask {
|
|
|
|
|
|
}
|
|
|
//获取要推送人员列表
|
|
|
- List<Employee> emList = new ArrayList<>();
|
|
|
-// emList = uasEmployeeService.getAll();
|
|
|
- Employee emp = uasEmployeeService.getByCode("TEST");
|
|
|
- if(emp!=null){
|
|
|
- emList.add(emp);
|
|
|
- }
|
|
|
+ List<Employee> emList = uasEmployeeService.getAll();
|
|
|
logger.info("pushSubsData-emList.size:"+emList.size());
|
|
|
if(CollectionUtils.isEmpty(emList)){
|
|
|
return;
|
|
|
@@ -80,7 +75,7 @@ public class DingTalkSubsTask {
|
|
|
for(Employee employee : emList){
|
|
|
try {
|
|
|
String title = "您有新的订阅信息";
|
|
|
- String description ="#您有新的订阅信息";
|
|
|
+ String description ="您有新的订阅信息";
|
|
|
String agentUrl = agent.getOuterUrl();
|
|
|
//获取待推送的订阅信息
|
|
|
List<Map<String,Object>> remindList =uasSubsService.getSubs_instance(employee.getEm_id());
|