Skip to content

C
cmeeting
提交 3d7a8e12 作者: 洪东保
操作

修改日志级别-不打印sql结果（太多日志了） 

debug-根据userId查询deptList
父级 cec2ee03
正在显示 包含 28 行增加 和 15 行删除
src/main/java/com/cmeeting/service/impl/MeetingRecordTemplateServiceImpl.java
......@@ -33,6 +33,7 @@ import com.cmeeting.service.SysUserSyncService;
import com.cmeeting.util.MinioUtils;
import com.cmeeting.vo.EditRecordTemplateVo;
import com.cmeeting.vo.RecordTemplateVO;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
......@@ -49,6 +50,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
import java.util.stream.Collectors;
@Service
@Slf4j
public class MeetingRecordTemplateServiceImpl extends ServiceImpl<MeetingRecordTemplateMapper, MeetingRecordTemplate> implements MeetingRecordTemplateService {
@Autowired
......@@ -428,9 +430,10 @@ public class MeetingRecordTemplateServiceImpl extends ServiceImpl<MeetingRecordT
*/
@Override
public MeetingRecordTemplate getEnabledRecordTemplate(Long meetType, String userId) {
log.info("查询用户可用模板, meetType: {}, userId: {}", meetType, userId);
MeetingRecordTemplate template = null;
List<SysUserSyncCategory> categoryList = sysUserSyncService.getCategoryListByUserId(userId);
List<String> parentDeptIdList = categoryList.stream().map(SysUserSyncCategory::getDeptId).collect(Collectors.toList());
String deptPathByUserId = sysUserSyncService.getDeptPathByUserId(userId);
List<String> parentDeptIdList = Arrays.asList(deptPathByUserId.split("/"));
List<MeetTypeDto> list = this.getMeetTypeList(userId, parentDeptIdList, "custom");
// 获取制定会议类型下的模板
for (MeetTypeDto meetTypeDto : list) {
......
src/main/java/com/cmeeting/service/impl/SysUserSyncServiceImpl.java
......@@ -53,8 +53,7 @@ public class SysUserSyncServiceImpl extends ServiceImpl<SysUserSysMapper, SysUse
public String getDeptPathByUserId(String userId) {
SysUserSync sysUserSync = baseMapper.selectOne(new LambdaQueryWrapper<SysUserSync>().eq(SysUserSync::getTenantId, perTenantId).eq(SysUserSync::getUserId, userId));
String deptId = sysUserSync.getDeptId();
String deptPath = getDeptPath("/" + deptId, deptId);
return deptPath;
return getDeptPath("/" + deptId, deptId);
}
/**
......@@ -90,7 +89,10 @@ public class SysUserSyncServiceImpl extends ServiceImpl<SysUserSysMapper, SysUse
if (CategoryConstant.ROOT_ID.equals(deptId)) {
return;
}
SysUserSyncCategory category = sysUserSyncCategoryMapper.selectOne(new LambdaQueryWrapper<SysUserSyncCategory>().eq(SysUserSyncCategory::getDeptId, deptId));
SysUserSyncCategory category = sysUserSyncCategoryMapper.selectOne(new LambdaQueryWrapper<SysUserSyncCategory>()
.eq(SysUserSyncCategory::getTenantId, perTenantId)
.eq(SysUserSyncCategory::getDeptId, deptId)
);
if (ObjectUtils.isEmpty(category)) {
return;
}
......
src/main/java/com/cmeeting/service/impl/TencentMeetingServiceImpl.java
......@@ -157,9 +157,10 @@ public class TencentMeetingServiceImpl extends ServiceImpl<TecentMeetingMapper,
String meetingId = meeting.getMeetingId();
String subMeetingId = null;
LocalDateTime mediaStartTime = LocalDateTime.ofInstant(Instant.ofEpochMilli(Long.valueOf(meeting.getMediaStartTime())), ZoneId.systemDefault());
String hostId = "";
try {
String userid = meeting.getUserid();
log.info("【周期会议扫描】:查询用户的已结束会议列表...meetingCode->{},userId->{}", meeting.getMeetingCode(), userid);
// log.info("【周期会议扫描】:查询用户的已结束会议列表...meetingCode->{},userId->{}", meeting.getMeetingCode(), userid);
//获取子会议id
V1HistoryMeetingsUseridGet200Response v1HistoryMeetingsUseridGet200Response = TencentMeetingApiUtil.ApiV1HistoryMeetingsUseridGetRequest(userid, meeting.getMeetingCode(),
String.valueOf(mediaStartTime.toLocalDate().atStartOfDay().atZone(ZoneId.systemDefault()).toEpochSecond()),
......@@ -181,20 +182,20 @@ public class TencentMeetingServiceImpl extends ServiceImpl<TecentMeetingMapper,
//如果数据库中已有相同会议id的记录，跳过同步
String finalSubMeetingId = subMeetingId;
if (meetingIds.stream().noneMatch(item -> item.getMeetingId().equals(meetingId) && Objects.equals(item.getSubMeetingId(), finalSubMeetingId))) {
log.info("【会议检索】新的会议meetingId->{}", meeting.getMeetingId());
// log.info("【会议检索】新的会议meetingId->{}", meeting.getMeetingId());
List<CorpRecordsVO.RecordFile> recordFiles = meeting.getRecordFiles();
//按转录文件时间升序，便于后续的内容拼接
List<String> recordFileIdList = recordFiles.stream().sorted(Comparator.comparingLong(CorpRecordsVO.RecordFile::getRecordStartTime))
.map(CorpRecordsVO.RecordFile::getRecordFileId).collect(Collectors.toList());
// TencentMeetingVO.RecordFile recordFileItem = TencentMeetingVO.RecordFile.builder()
// .recordFileIdList(recordFileIdList).meetingId(meetingId).subMeetingId(subMeetingId).build();
String hostId;
String hostName;
//优先使用会议列表中已有的主持人字段
if (StringUtils.isNotEmpty(meeting.getHostUserId())) {
hostId = meeting.getHostUserId();
hostName = meetingMap.getOrDefault(hostId, null);
log.info("从会议列表中成功获取到主持人信息");
log.info("从会议列表中成功获取到主持人信息, hostId: {}", hostId);
} else {
//判断主持人是否存在，如果主持人未参会，是查不到主持人的
//如果主持人未参会，使用会议详情中的创建人作为主持人
......@@ -231,12 +232,14 @@ public class TencentMeetingServiceImpl extends ServiceImpl<TecentMeetingMapper,
}
}
//判断是否有权限生成纪要
boolean generateAccess;
boolean generateAccess = false;
boolean emailPushAccess;
UserDTO userDTO = accessUserIds.stream().filter(item -> item.getTid().equals(hostId)).findFirst().get();
String finalHostId = hostId;
UserDTO userDTO = accessUserIds.stream().filter(item -> item.getTid().equals(finalHostId)).findFirst().get();
String userId = weComUserMap.get(userDTO.getWid()).getUserId();
// 1. 智能体需要授权
generateAccess = accessUserIds.stream().anyMatch(item -> item.getTid().equals(hostId));
String finalHostId1 = hostId;
generateAccess = accessUserIds.stream().anyMatch(item -> item.getTid().equals(finalHostId1));
log.info("用户: {}, 智能体是否授权: {}", userId, generateAccess);
String email = userDTO.getEmail();
......@@ -279,11 +282,15 @@ public class TencentMeetingServiceImpl extends ServiceImpl<TecentMeetingMapper,
meetingSaveList.add(meetingItem);
}
} catch (Exception e) {
if (e instanceof NoSuchElementException) {
log.error("meetingId: {}, hostId: {}", meetingId, hostId);
} else {
log.error(e.getMessage());
}
}
}
}
}
if (meetingSaveList.size() > 0) {
Map<String, List<MeetingInfo>> meetingSaveMap = meetingSaveList.stream().collect(Collectors.groupingBy(
item -> item.getMeetingId() + "_" +
......
src/main/resources/logback-spring.xml
......@@ -39,7 +39,7 @@
<!-- 此日志appender是为开发使用，只配置最底级别，控制台输出的日志级别是大于或等于此级别的日志信息 -->
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
<level>
trace
debug
</level>
</filter>
<encoder>
......
src/main/resources/mapper/primary/MeetingInfoMapper.xml
......@@ -3,7 +3,7 @@
<mapper namespace="com.cmeeting.mapper.primary.MeetingInfoMapper">
<insert id="batchInsert" parameterType="list">
INSERT IGNORE INTO cmt_meeting_info (subject, meeting_id, meeting_code, host, host_uid, participant_users, start_time,
end_time, is_generated, email_push_access, is_pushed, sync_time, sub_meeting_id, record_content, record_xml, generate_retry,
end_time, is_generated, email_generate_access, email_push_access, is_pushed, sync_time, sub_meeting_id, record_content, record_xml, generate_retry,
push_retry, record_file_id,email)
VALUES
<foreach collection="meetingSaveList" item="meeting" separator=",">
......@@ -17,6 +17,7 @@
#{meeting.startTime},
#{meeting.endTime},
#{meeting.isGenerated},
#{meeting.emailGenerateAccess},
#{meeting.emailPushAccess},
#{meeting.isPushed},
#{meeting.syncTime},
......
src/main/resources/mapper/primary/WeComUserMapper.xml
......@@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.cmeeting.mapper.primary.WeComUserMapper">
<select id="selectById" resultType="com.cmeeting.pojo.WeComUser">
SELECT id, user_name as userName, user_id as userId, isepeat_name as isRepeatName
SELECT id, user_name as userName, user_id as userId, isepeat_name as isRepeatNam
FROM user_wecom
WHERE id = #{id}
</select>
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论