提交 58a4154a 作者: 洪东保

debug

父级 d220d6cc
...@@ -99,7 +99,7 @@ public class MeetingInfo implements Serializable { ...@@ -99,7 +99,7 @@ public class MeetingInfo implements Serializable {
*/ */
private Boolean isPushed; private Boolean isPushed;
/** /**
* 会议状态: 0新会议待处理 1生成纪要失败 2生成纪要成功 3推送邮件成功 4推送邮件失败 5转录文件为空 * 会议状态: 0新会议待处理 1生成纪要失败 2生成纪要成功 3推送邮件成功 4推送邮件失败 5转录文件为空 6文件已删除
*/ */
private Integer status; private Integer status;
/** /**
...@@ -154,6 +154,7 @@ public class MeetingInfo implements Serializable { ...@@ -154,6 +154,7 @@ public class MeetingInfo implements Serializable {
* 是否在重新生成 * 是否在重新生成
*/ */
private Boolean reprocess = false; private Boolean reprocess = false;
private Boolean clear = false;
@TableField(exist = false) @TableField(exist = false)
private String userId; private String userId;
......
...@@ -132,7 +132,7 @@ public class MeetingInfoServiceImpl extends ServiceImpl<MeetingInfoMapper, Meeti ...@@ -132,7 +132,7 @@ public class MeetingInfoServiceImpl extends ServiceImpl<MeetingInfoMapper, Meeti
.between(vo.getStartTime() != null, MeetingInfo::getStartTime, vo.getStartTime(), vo.getEndTime()) .between(vo.getStartTime() != null, MeetingInfo::getStartTime, vo.getStartTime(), vo.getEndTime())
.orderByDesc(MeetingInfo::getStartTime) .orderByDesc(MeetingInfo::getStartTime)
.select(MeetingInfo::getId, MeetingInfo::getMeetingId, MeetingInfo::getSubject, MeetingInfo::getHost, MeetingInfo::getHostUid, .select(MeetingInfo::getId, MeetingInfo::getMeetingId, MeetingInfo::getSubject, MeetingInfo::getHost, MeetingInfo::getHostUid,
MeetingInfo::getStartTime, MeetingInfo::getEndTime, MeetingInfo::getIsGenerated, MeetingInfo::getIsPushed, MeetingInfo::getReprocess); MeetingInfo::getStartTime, MeetingInfo::getEndTime, MeetingInfo::getIsGenerated, MeetingInfo::getIsPushed, MeetingInfo::getReprocess, MeetingInfo::getClear);
Page<MeetingInfo> meetingInfoPage = mapper.selectPage(new Page<>(vo.getCurrent(), vo.getSize()), queryWrapper); Page<MeetingInfo> meetingInfoPage = mapper.selectPage(new Page<>(vo.getCurrent(), vo.getSize()), queryWrapper);
if (CollUtil.isNotEmpty(meetingInfoPage.getRecords())) { if (CollUtil.isNotEmpty(meetingInfoPage.getRecords())) {
List<MeetingInfo> records = meetingInfoPage.getRecords(); List<MeetingInfo> records = meetingInfoPage.getRecords();
...@@ -179,14 +179,14 @@ public class MeetingInfoServiceImpl extends ServiceImpl<MeetingInfoMapper, Meeti ...@@ -179,14 +179,14 @@ public class MeetingInfoServiceImpl extends ServiceImpl<MeetingInfoMapper, Meeti
log.warn("key already exists in redis!, key: {}", key); log.warn("key already exists in redis!, key: {}", key);
return false; return false;
} }
regenerateProcessExecutor.execute(()->{
try{
meetingInfoMapper.update(null, meetingInfoMapper.update(null,
new LambdaUpdateWrapper<MeetingInfo>() new LambdaUpdateWrapper<MeetingInfo>()
.eq(MeetingInfo::getMeetingId, meetingInfo.getMeetingId()) .eq(MeetingInfo::getMeetingId, meetingInfo.getMeetingId())
.eq(meetingInfo.getSubMeetingId() != null, MeetingInfo::getSubMeetingId, meetingInfo.getSubMeetingId()) .eq(meetingInfo.getSubMeetingId() != null, MeetingInfo::getSubMeetingId, meetingInfo.getSubMeetingId())
.set(MeetingInfo::getReprocess, true) .set(MeetingInfo::getReprocess, true)
); );
regenerateProcessExecutor.execute(()->{
try{
regenerateXml(meetingInfo, meetingRecordTemplate); regenerateXml(meetingInfo, meetingRecordTemplate);
} finally { } finally {
meetingInfoMapper.update(null, meetingInfoMapper.update(null,
......
...@@ -128,7 +128,6 @@ public class TencentMeetingServiceImpl extends ServiceImpl<TecentMeetingMapper, ...@@ -128,7 +128,6 @@ public class TencentMeetingServiceImpl extends ServiceImpl<TecentMeetingMapper,
public List<TencentMeetingVO.RecordFile> getMeetingFiles(List<UserDTO> accessUserIds, Map<String, WeComUser> weComUserMap) { public List<TencentMeetingVO.RecordFile> getMeetingFiles(List<UserDTO> accessUserIds, Map<String, WeComUser> weComUserMap) {
List<TencentMeetingVO.RecordFile> meetingFiles = new ArrayList<>(); List<TencentMeetingVO.RecordFile> meetingFiles = new ArrayList<>();
List<MeetingInfo> meetingSaveList = new ArrayList<>(); List<MeetingInfo> meetingSaveList = new ArrayList<>();
int i = 0;
// 查询近searchDays天的会议录制列表 // 查询近searchDays天的会议录制列表
try { try {
ZonedDateTime now = ZonedDateTime.now(); ZonedDateTime now = ZonedDateTime.now();
...@@ -158,9 +157,6 @@ public class TencentMeetingServiceImpl extends ServiceImpl<TecentMeetingMapper, ...@@ -158,9 +157,6 @@ public class TencentMeetingServiceImpl extends ServiceImpl<TecentMeetingMapper,
List<TencentMeetingUser> meetingUsers = tecentMeetingMapper.getAlluser(); List<TencentMeetingUser> meetingUsers = tecentMeetingMapper.getAlluser();
Map<String, String> meetingMap = meetingUsers.stream().collect(Collectors.toMap(TencentMeetingUser::getUserId, TencentMeetingUser::getUserName)); Map<String, String> meetingMap = meetingUsers.stream().collect(Collectors.toMap(TencentMeetingUser::getUserId, TencentMeetingUser::getUserName));
while (currentPage.intValue() <= totalPage){ while (currentPage.intValue() <= totalPage){
if (i >= 150) {
break;
}
CorpRecordsVO data = fetchMeetingRecords(tencentAdminUserId, 1, startTime, endTime, currentPage.getAndIncrement(), 20); CorpRecordsVO data = fetchMeetingRecords(tencentAdminUserId, 1, startTime, endTime, currentPage.getAndIncrement(), 20);
//设置总页数 //设置总页数
if (data != null && data.getRecordMeetings() != null && !data.getRecordMeetings().isEmpty()) { if (data != null && data.getRecordMeetings() != null && !data.getRecordMeetings().isEmpty()) {
...@@ -296,7 +292,6 @@ public class TencentMeetingServiceImpl extends ServiceImpl<TecentMeetingMapper, ...@@ -296,7 +292,6 @@ public class TencentMeetingServiceImpl extends ServiceImpl<TecentMeetingMapper,
.email(email) .email(email)
.build(); .build();
meetingSaveList.add(meetingItem); meetingSaveList.add(meetingItem);
i++;
} }
} catch (Exception e) { } catch (Exception e) {
if (e instanceof NoSuchElementException) { if (e instanceof NoSuchElementException) {
......
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
</select> </select>
<delete id="deleteDataAfterThan2Days"> <delete id="deleteDataAfterThan2Days">
update cmt_meeting_info set record_content = '', record_xml = '' where start_time &lt; DATE_SUB(#{date}, INTERVAL 1 DAY); update cmt_meeting_info set record_content = '', record_xml = '',clear = 1 where start_time &lt; DATE_SUB(#{date}, INTERVAL 1 DAY);
</delete> </delete>
</mapper> </mapper>
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论