提交 e122b864 作者: 洪东保

推送邮件debug

# Conflicts:
#	src/main/java/com/cmeeting/service/impl/MeetingInfoServiceImpl.java
父级 3d4aa2d3
......@@ -79,7 +79,6 @@ public class CmeetingJob {
}
try {
log.info("-------企微人员定时同步任务开始-------");
log.info("当前时间: " + LocalDate.now().format(DateTimeFormatter.ISO_LOCAL_DATE));
weComService.doUsers();
log.info("-------企微人员定时同步任务结束--------");
......@@ -163,7 +162,7 @@ public class CmeetingJob {
log.info("无生成纪要权限的人员");
return;
}
List<TencentMeetingVO.RecordFile> meetingFiles = tencentMeetingService.getMeetingFiles(accessUserIds, weComUserMap);
List<TencentMeetingVO.RecordFile> meetingFiles = tencentMeetingService.getMeetingFiles();
if (meetingFiles == null || meetingFiles.isEmpty()) {
log.info("没有录制文件需要处理");
......@@ -310,7 +309,6 @@ public class CmeetingJob {
@Value(value = "${tencent.base-save-path}")
private String savePath;
@Scheduled(cron = "50 59 7,9,11,13,15,17,19,21,23 * * ?")
public void emailStatisticsPush() {
ThreadUtil.execute(()->{
......@@ -340,11 +338,10 @@ public class CmeetingJob {
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
List<SysUserSyncCategory> tree = sysUserSyncService.getTreeList();
try {
boolean b = meetingInfoService.statisticsEmail(subject, simpleDateFormat1.parse(simpleDateFormat.format(date) + " 00:00:00"),
simpleDateFormat1.parse(simpleDateFormat.format(date) + " 23:59:59"), new FileOutputStream(file));
simpleDateFormat1.parse(simpleDateFormat.format(date) + " 23:59:59"), new FileOutputStream(file), DeptCollect.DEPT_MAP);
if (b) {
content = "<p data-olk-copy-source=\\\"MessageBody\\\">Dear all:<br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;附件为今天Cmeeting会议纪要生成和发送情况,烦请查收。</p>";
StatisticsEmailPush.Attachment attachment = new StatisticsEmailPush.Attachment();
......
......@@ -725,26 +725,7 @@ public class MeetingInfoServiceImpl extends ServiceImpl<MeetingInfoMapper, Meeti
}
}
private static Map<String, String> DEPT_MAP = new HashMap<>(20);
static {
DEPT_MAP.put("10340", "集团总部");
DEPT_MAP.put("602700", "能化板块");
DEPT_MAP.put("616859", "空港板块");
DEPT_MAP.put("616766", "集装箱集团");
DEPT_MAP.put("616844", "车辆板块");
DEPT_MAP.put("616860", "海工板块");
DEPT_MAP.put("616861", "产城板块");
DEPT_MAP.put("640071", "物流板块");
DEPT_MAP.put("617560", "融资租赁贵公司");
DEPT_MAP.put("640075", "财务公司");
DEPT_MAP.put("641858", "其他类型企业");
DEPT_MAP.put("707435", "集团创新企业");
DEPT_MAP.put("686701", "中集海工");
DEPT_MAP.put("710972", "中集资本");
DEPT_MAP.put("711091", "中集载具");
DEPT_MAP.put("698023", "中集同创");
}
/**
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论