Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
C
cmeeting
概览
概览
详情
活动
周期分析
版本库
存储库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
问题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程表
图表
维基
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
Issue Boards
Open sidebar
翟斌
cmeeting
Commits
3d7a8e12
提交
3d7a8e12
authored
7月 24, 2025
作者:
洪东保
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
修改日志级别-不打印sql结果(太多日志了)
debug-根据userId查询deptList
父级
cec2ee03
显示空白字符变更
内嵌
并排
正在显示
6 个修改的文件
包含
28 行增加
和
15 行删除
+28
-15
src/main/java/com/cmeeting/service/impl/MeetingRecordTemplateServiceImpl.java
+5
-2
src/main/java/com/cmeeting/service/impl/SysUserSyncServiceImpl.java
+5
-3
src/main/java/com/cmeeting/service/impl/TencentMeetingServiceImpl.java
+14
-7
src/main/resources/logback-spring.xml
+1
-1
src/main/resources/mapper/primary/MeetingInfoMapper.xml
+2
-1
src/main/resources/mapper/primary/WeComUserMapper.xml
+1
-1
没有找到文件。
src/main/java/com/cmeeting/service/impl/MeetingRecordTemplateServiceImpl.java
浏览文件 @
3d7a8e12
...
@@ -33,6 +33,7 @@ import com.cmeeting.service.SysUserSyncService;
...
@@ -33,6 +33,7 @@ import com.cmeeting.service.SysUserSyncService;
import
com.cmeeting.util.MinioUtils
;
import
com.cmeeting.util.MinioUtils
;
import
com.cmeeting.vo.EditRecordTemplateVo
;
import
com.cmeeting.vo.EditRecordTemplateVo
;
import
com.cmeeting.vo.RecordTemplateVO
;
import
com.cmeeting.vo.RecordTemplateVO
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.beans.factory.annotation.Value
;
...
@@ -49,6 +50,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
...
@@ -49,6 +50,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
import
java.util.stream.Collectors
;
import
java.util.stream.Collectors
;
@Service
@Service
@Slf4j
public
class
MeetingRecordTemplateServiceImpl
extends
ServiceImpl
<
MeetingRecordTemplateMapper
,
MeetingRecordTemplate
>
implements
MeetingRecordTemplateService
{
public
class
MeetingRecordTemplateServiceImpl
extends
ServiceImpl
<
MeetingRecordTemplateMapper
,
MeetingRecordTemplate
>
implements
MeetingRecordTemplateService
{
@Autowired
@Autowired
...
@@ -428,9 +430,10 @@ public class MeetingRecordTemplateServiceImpl extends ServiceImpl<MeetingRecordT
...
@@ -428,9 +430,10 @@ public class MeetingRecordTemplateServiceImpl extends ServiceImpl<MeetingRecordT
*/
*/
@Override
@Override
public
MeetingRecordTemplate
getEnabledRecordTemplate
(
Long
meetType
,
String
userId
)
{
public
MeetingRecordTemplate
getEnabledRecordTemplate
(
Long
meetType
,
String
userId
)
{
log
.
info
(
"查询用户可用模板, meetType: {}, userId: {}"
,
meetType
,
userId
);
MeetingRecordTemplate
template
=
null
;
MeetingRecordTemplate
template
=
null
;
List
<
SysUserSyncCategory
>
categoryList
=
sysUserSyncService
.
getCategoryList
ByUserId
(
userId
);
String
deptPathByUserId
=
sysUserSyncService
.
getDeptPath
ByUserId
(
userId
);
List
<
String
>
parentDeptIdList
=
categoryList
.
stream
().
map
(
SysUserSyncCategory:
:
getDeptId
).
collect
(
Collectors
.
toList
(
));
List
<
String
>
parentDeptIdList
=
Arrays
.
asList
(
deptPathByUserId
.
split
(
"/"
));
List
<
MeetTypeDto
>
list
=
this
.
getMeetTypeList
(
userId
,
parentDeptIdList
,
"custom"
);
List
<
MeetTypeDto
>
list
=
this
.
getMeetTypeList
(
userId
,
parentDeptIdList
,
"custom"
);
// 获取制定会议类型下的模板
// 获取制定会议类型下的模板
for
(
MeetTypeDto
meetTypeDto
:
list
)
{
for
(
MeetTypeDto
meetTypeDto
:
list
)
{
...
...
src/main/java/com/cmeeting/service/impl/SysUserSyncServiceImpl.java
浏览文件 @
3d7a8e12
...
@@ -53,8 +53,7 @@ public class SysUserSyncServiceImpl extends ServiceImpl<SysUserSysMapper, SysUse
...
@@ -53,8 +53,7 @@ public class SysUserSyncServiceImpl extends ServiceImpl<SysUserSysMapper, SysUse
public
String
getDeptPathByUserId
(
String
userId
)
{
public
String
getDeptPathByUserId
(
String
userId
)
{
SysUserSync
sysUserSync
=
baseMapper
.
selectOne
(
new
LambdaQueryWrapper
<
SysUserSync
>().
eq
(
SysUserSync:
:
getTenantId
,
perTenantId
).
eq
(
SysUserSync:
:
getUserId
,
userId
));
SysUserSync
sysUserSync
=
baseMapper
.
selectOne
(
new
LambdaQueryWrapper
<
SysUserSync
>().
eq
(
SysUserSync:
:
getTenantId
,
perTenantId
).
eq
(
SysUserSync:
:
getUserId
,
userId
));
String
deptId
=
sysUserSync
.
getDeptId
();
String
deptId
=
sysUserSync
.
getDeptId
();
String
deptPath
=
getDeptPath
(
"/"
+
deptId
,
deptId
);
return
getDeptPath
(
"/"
+
deptId
,
deptId
);
return
deptPath
;
}
}
/**
/**
...
@@ -90,7 +89,10 @@ public class SysUserSyncServiceImpl extends ServiceImpl<SysUserSysMapper, SysUse
...
@@ -90,7 +89,10 @@ public class SysUserSyncServiceImpl extends ServiceImpl<SysUserSysMapper, SysUse
if
(
CategoryConstant
.
ROOT_ID
.
equals
(
deptId
))
{
if
(
CategoryConstant
.
ROOT_ID
.
equals
(
deptId
))
{
return
;
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
))
{
if
(
ObjectUtils
.
isEmpty
(
category
))
{
return
;
return
;
}
}
...
...
src/main/java/com/cmeeting/service/impl/TencentMeetingServiceImpl.java
浏览文件 @
3d7a8e12
...
@@ -157,9 +157,10 @@ public class TencentMeetingServiceImpl extends ServiceImpl<TecentMeetingMapper,
...
@@ -157,9 +157,10 @@ public class TencentMeetingServiceImpl extends ServiceImpl<TecentMeetingMapper,
String
meetingId
=
meeting
.
getMeetingId
();
String
meetingId
=
meeting
.
getMeetingId
();
String
subMeetingId
=
null
;
String
subMeetingId
=
null
;
LocalDateTime
mediaStartTime
=
LocalDateTime
.
ofInstant
(
Instant
.
ofEpochMilli
(
Long
.
valueOf
(
meeting
.
getMediaStartTime
())),
ZoneId
.
systemDefault
());
LocalDateTime
mediaStartTime
=
LocalDateTime
.
ofInstant
(
Instant
.
ofEpochMilli
(
Long
.
valueOf
(
meeting
.
getMediaStartTime
())),
ZoneId
.
systemDefault
());
String
hostId
=
""
;
try
{
try
{
String
userid
=
meeting
.
getUserid
();
String
userid
=
meeting
.
getUserid
();
log
.
info
(
"【周期会议扫描】:查询用户的已结束会议列表...meetingCode->{},userId->{}"
,
meeting
.
getMeetingCode
(),
userid
);
//
log.info("【周期会议扫描】:查询用户的已结束会议列表...meetingCode->{},userId->{}", meeting.getMeetingCode(), userid);
//获取子会议id
//获取子会议id
V1HistoryMeetingsUseridGet200Response
v1HistoryMeetingsUseridGet200Response
=
TencentMeetingApiUtil
.
ApiV1HistoryMeetingsUseridGetRequest
(
userid
,
meeting
.
getMeetingCode
(),
V1HistoryMeetingsUseridGet200Response
v1HistoryMeetingsUseridGet200Response
=
TencentMeetingApiUtil
.
ApiV1HistoryMeetingsUseridGetRequest
(
userid
,
meeting
.
getMeetingCode
(),
String
.
valueOf
(
mediaStartTime
.
toLocalDate
().
atStartOfDay
().
atZone
(
ZoneId
.
systemDefault
()).
toEpochSecond
()),
String
.
valueOf
(
mediaStartTime
.
toLocalDate
().
atStartOfDay
().
atZone
(
ZoneId
.
systemDefault
()).
toEpochSecond
()),
...
@@ -181,20 +182,20 @@ public class TencentMeetingServiceImpl extends ServiceImpl<TecentMeetingMapper,
...
@@ -181,20 +182,20 @@ public class TencentMeetingServiceImpl extends ServiceImpl<TecentMeetingMapper,
//如果数据库中已有相同会议id的记录,跳过同步
//如果数据库中已有相同会议id的记录,跳过同步
String
finalSubMeetingId
=
subMeetingId
;
String
finalSubMeetingId
=
subMeetingId
;
if
(
meetingIds
.
stream
().
noneMatch
(
item
->
item
.
getMeetingId
().
equals
(
meetingId
)
&&
Objects
.
equals
(
item
.
getSubMeetingId
(),
finalSubMeetingId
)))
{
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
<
CorpRecordsVO
.
RecordFile
>
recordFiles
=
meeting
.
getRecordFiles
();
//按转录文件时间升序,便于后续的内容拼接
//按转录文件时间升序,便于后续的内容拼接
List
<
String
>
recordFileIdList
=
recordFiles
.
stream
().
sorted
(
Comparator
.
comparingLong
(
CorpRecordsVO
.
RecordFile
::
getRecordStartTime
))
List
<
String
>
recordFileIdList
=
recordFiles
.
stream
().
sorted
(
Comparator
.
comparingLong
(
CorpRecordsVO
.
RecordFile
::
getRecordStartTime
))
.
map
(
CorpRecordsVO
.
RecordFile
::
getRecordFileId
).
collect
(
Collectors
.
toList
());
.
map
(
CorpRecordsVO
.
RecordFile
::
getRecordFileId
).
collect
(
Collectors
.
toList
());
// TencentMeetingVO.RecordFile recordFileItem = TencentMeetingVO.RecordFile.builder()
// TencentMeetingVO.RecordFile recordFileItem = TencentMeetingVO.RecordFile.builder()
// .recordFileIdList(recordFileIdList).meetingId(meetingId).subMeetingId(subMeetingId).build();
// .recordFileIdList(recordFileIdList).meetingId(meetingId).subMeetingId(subMeetingId).build();
String
hostId
;
String
hostName
;
String
hostName
;
//优先使用会议列表中已有的主持人字段
//优先使用会议列表中已有的主持人字段
if
(
StringUtils
.
isNotEmpty
(
meeting
.
getHostUserId
()))
{
if
(
StringUtils
.
isNotEmpty
(
meeting
.
getHostUserId
()))
{
hostId
=
meeting
.
getHostUserId
();
hostId
=
meeting
.
getHostUserId
();
hostName
=
meetingMap
.
getOrDefault
(
hostId
,
null
);
hostName
=
meetingMap
.
getOrDefault
(
hostId
,
null
);
log
.
info
(
"从会议列表中成功获取到主持人信息
"
);
log
.
info
(
"从会议列表中成功获取到主持人信息
, hostId: {}"
,
hostId
);
}
else
{
}
else
{
//判断主持人是否存在,如果主持人未参会,是查不到主持人的
//判断主持人是否存在,如果主持人未参会,是查不到主持人的
//如果主持人未参会,使用会议详情中的创建人作为主持人
//如果主持人未参会,使用会议详情中的创建人作为主持人
...
@@ -231,12 +232,14 @@ public class TencentMeetingServiceImpl extends ServiceImpl<TecentMeetingMapper,
...
@@ -231,12 +232,14 @@ public class TencentMeetingServiceImpl extends ServiceImpl<TecentMeetingMapper,
}
}
}
}
//判断是否有权限生成纪要
//判断是否有权限生成纪要
boolean
generateAccess
;
boolean
generateAccess
=
false
;
boolean
emailPushAccess
;
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
();
String
userId
=
weComUserMap
.
get
(
userDTO
.
getWid
()).
getUserId
();
// 1. 智能体需要授权
// 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
);
log
.
info
(
"用户: {}, 智能体是否授权: {}"
,
userId
,
generateAccess
);
String
email
=
userDTO
.
getEmail
();
String
email
=
userDTO
.
getEmail
();
...
@@ -279,11 +282,15 @@ public class TencentMeetingServiceImpl extends ServiceImpl<TecentMeetingMapper,
...
@@ -279,11 +282,15 @@ public class TencentMeetingServiceImpl extends ServiceImpl<TecentMeetingMapper,
meetingSaveList
.
add
(
meetingItem
);
meetingSaveList
.
add
(
meetingItem
);
}
}
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
if
(
e
instanceof
NoSuchElementException
)
{
log
.
error
(
"meetingId: {}, hostId: {}"
,
meetingId
,
hostId
);
}
else
{
log
.
error
(
e
.
getMessage
());
log
.
error
(
e
.
getMessage
());
}
}
}
}
}
}
}
}
}
if
(
meetingSaveList
.
size
()
>
0
)
{
if
(
meetingSaveList
.
size
()
>
0
)
{
Map
<
String
,
List
<
MeetingInfo
>>
meetingSaveMap
=
meetingSaveList
.
stream
().
collect
(
Collectors
.
groupingBy
(
Map
<
String
,
List
<
MeetingInfo
>>
meetingSaveMap
=
meetingSaveList
.
stream
().
collect
(
Collectors
.
groupingBy
(
item
->
item
.
getMeetingId
()
+
"_"
+
item
->
item
.
getMeetingId
()
+
"_"
+
...
...
src/main/resources/logback-spring.xml
浏览文件 @
3d7a8e12
...
@@ -39,7 +39,7 @@
...
@@ -39,7 +39,7 @@
<!-- 此日志appender是为开发使用,只配置最底级别,控制台输出的日志级别是大于或等于此级别的日志信息 -->
<!-- 此日志appender是为开发使用,只配置最底级别,控制台输出的日志级别是大于或等于此级别的日志信息 -->
<filter
class=
"ch.qos.logback.classic.filter.ThresholdFilter"
>
<filter
class=
"ch.qos.logback.classic.filter.ThresholdFilter"
>
<level>
<level>
trace
debug
</level>
</level>
</filter>
</filter>
<encoder>
<encoder>
...
...
src/main/resources/mapper/primary/MeetingInfoMapper.xml
浏览文件 @
3d7a8e12
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
<mapper
namespace=
"com.cmeeting.mapper.primary.MeetingInfoMapper"
>
<mapper
namespace=
"com.cmeeting.mapper.primary.MeetingInfoMapper"
>
<insert
id=
"batchInsert"
parameterType=
"list"
>
<insert
id=
"batchInsert"
parameterType=
"list"
>
INSERT IGNORE INTO cmt_meeting_info (subject, meeting_id, meeting_code, host, host_uid, participant_users, start_time,
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)
push_retry, record_file_id,email)
VALUES
VALUES
<foreach
collection=
"meetingSaveList"
item=
"meeting"
separator=
","
>
<foreach
collection=
"meetingSaveList"
item=
"meeting"
separator=
","
>
...
@@ -17,6 +17,7 @@
...
@@ -17,6 +17,7 @@
#{meeting.startTime},
#{meeting.startTime},
#{meeting.endTime},
#{meeting.endTime},
#{meeting.isGenerated},
#{meeting.isGenerated},
#{meeting.emailGenerateAccess},
#{meeting.emailPushAccess},
#{meeting.emailPushAccess},
#{meeting.isPushed},
#{meeting.isPushed},
#{meeting.syncTime},
#{meeting.syncTime},
...
...
src/main/resources/mapper/primary/WeComUserMapper.xml
浏览文件 @
3d7a8e12
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<!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"
>
<mapper
namespace=
"com.cmeeting.mapper.primary.WeComUserMapper"
>
<select
id=
"selectById"
resultType=
"com.cmeeting.pojo.WeComUser"
>
<select
id=
"selectById"
resultType=
"com.cmeeting.pojo.WeComUser"
>
SELECT id, user_name as userName, user_id as userId, isepeat_name as isRepeatNam
e
SELECT id, user_name as userName, user_id as userId, isepeat_name as isRepeatNam
FROM user_wecom
FROM user_wecom
WHERE id = #{id}
WHERE id = #{id}
</select>
</select>
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论