Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
C
cmeeting
概览
概览
详情
活动
周期分析
版本库
存储库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
问题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程表
图表
维基
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
Issue Boards
Open sidebar
翟斌
cmeeting
Commits
17588e65
提交
17588e65
authored
7月 21, 2025
作者:
洪东保
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
debug
父级
b07807a1
显示空白字符变更
内嵌
并排
正在显示
4 个修改的文件
包含
17 行增加
和
17 行删除
+17
-17
src/main/java/com/cmeeting/ad/entity/RobotSecurityUser.java
+1
-1
src/main/java/com/cmeeting/service/impl/MeetTypeServiceImpl.java
+5
-5
src/main/java/com/cmeeting/service/impl/MeetingRecordTemplateServiceImpl.java
+7
-7
src/main/resources/application.yml
+4
-4
没有找到文件。
src/main/java/com/cmeeting/ad/entity/RobotSecurityUser.java
浏览文件 @
17588e65
...
@@ -31,7 +31,7 @@ public class RobotSecurityUser implements UserDetails {
...
@@ -31,7 +31,7 @@ public class RobotSecurityUser implements UserDetails {
*/
*/
private
Integer
userType
;
private
Integer
userType
;
private
String
id
;
private
String
id
;
private
Stri
ng
userId
;
private
Lo
ng
userId
;
private
String
username
;
private
String
username
;
@JsonIgnore
@JsonIgnore
private
String
password
;
private
String
password
;
...
...
src/main/java/com/cmeeting/service/impl/MeetTypeServiceImpl.java
浏览文件 @
17588e65
...
@@ -77,8 +77,8 @@ public class MeetTypeServiceImpl extends ServiceImpl<MeetTypeMapper, MeetType>
...
@@ -77,8 +77,8 @@ public class MeetTypeServiceImpl extends ServiceImpl<MeetTypeMapper, MeetType>
meetType
.
setContent
(
meetingTypeVo
.
getContent
());
meetType
.
setContent
(
meetingTypeVo
.
getContent
());
meetType
.
setCreateTime
(
now
);
meetType
.
setCreateTime
(
now
);
meetType
.
setUpdateTime
(
now
);
meetType
.
setUpdateTime
(
now
);
meetType
.
setCreateUser
(
loginUser
.
getUserId
(
));
meetType
.
setCreateUser
(
String
.
format
(
"%08d"
,
loginUser
.
getUserId
()
));
meetType
.
setUpdateUser
(
loginUser
.
getUserId
(
));
meetType
.
setUpdateUser
(
String
.
format
(
"%08d"
,
loginUser
.
getUserId
()
));
meetType
.
setCreateUserName
(
loginUser
.
getUsername
());
meetType
.
setCreateUserName
(
loginUser
.
getUsername
());
meetType
.
setUpdateUserName
(
loginUser
.
getUsername
());
meetType
.
setUpdateUserName
(
loginUser
.
getUsername
());
if
(
meetTypeMapper
.
insert
(
meetType
)
!=
0
)
{
if
(
meetTypeMapper
.
insert
(
meetType
)
!=
0
)
{
...
@@ -111,7 +111,7 @@ public class MeetTypeServiceImpl extends ServiceImpl<MeetTypeMapper, MeetType>
...
@@ -111,7 +111,7 @@ public class MeetTypeServiceImpl extends ServiceImpl<MeetTypeMapper, MeetType>
meetType
.
setRelId
(
meetingTypeVo
.
getRelId
());
meetType
.
setRelId
(
meetingTypeVo
.
getRelId
());
meetType
.
setContent
(
meetingTypeVo
.
getContent
());
meetType
.
setContent
(
meetingTypeVo
.
getContent
());
meetType
.
setUpdateTime
(
now
);
meetType
.
setUpdateTime
(
now
);
meetType
.
setUpdateUser
(
loginUser
.
getUserId
(
));
meetType
.
setUpdateUser
(
String
.
format
(
"%08d"
,
loginUser
.
getUserId
()
));
meetType
.
setUpdateUserName
(
loginUser
.
getUsername
());
meetType
.
setUpdateUserName
(
loginUser
.
getUsername
());
if
(
meetTypeMapper
.
updateById
(
meetType
)
!=
0
)
{
if
(
meetTypeMapper
.
updateById
(
meetType
)
!=
0
)
{
modulePermissionService
.
remove
(
new
LambdaQueryWrapper
<
ModulePermission
>()
modulePermissionService
.
remove
(
new
LambdaQueryWrapper
<
ModulePermission
>()
...
@@ -178,7 +178,7 @@ public class MeetTypeServiceImpl extends ServiceImpl<MeetTypeMapper, MeetType>
...
@@ -178,7 +178,7 @@ public class MeetTypeServiceImpl extends ServiceImpl<MeetTypeMapper, MeetType>
public
List
<
MeetTypeDto
>
getSystemMeetTypeList
()
{
public
List
<
MeetTypeDto
>
getSystemMeetTypeList
()
{
RobotSecurityUser
loginUser
=
SecurityUtil
.
getUser
();
RobotSecurityUser
loginUser
=
SecurityUtil
.
getUser
();
// 查询系统通用会议类型
// 查询系统通用会议类型
List
<
MeetTypeDto
>
meetTypeDtoList
=
meetTypeMapper
.
selectSystemMeetTypeList
(
loginUser
.
getUserId
(
));
List
<
MeetTypeDto
>
meetTypeDtoList
=
meetTypeMapper
.
selectSystemMeetTypeList
(
String
.
format
(
"%08d"
,
loginUser
.
getUserId
()
));
meetTypeDtoList
.
stream
().
forEach
(
meetTypeDto
->
meetTypeDto
.
setType
(
MeetingTypeConstant
.
TYPE_SYSTEM
));
meetTypeDtoList
.
stream
().
forEach
(
meetTypeDto
->
meetTypeDto
.
setType
(
MeetingTypeConstant
.
TYPE_SYSTEM
));
return
meetTypeDtoList
;
return
meetTypeDtoList
;
...
@@ -193,7 +193,7 @@ public class MeetTypeServiceImpl extends ServiceImpl<MeetTypeMapper, MeetType>
...
@@ -193,7 +193,7 @@ public class MeetTypeServiceImpl extends ServiceImpl<MeetTypeMapper, MeetType>
public
List
<
MeetTypeDto
>
getCustomMeetTypeList
()
{
public
List
<
MeetTypeDto
>
getCustomMeetTypeList
()
{
RobotSecurityUser
loginUser
=
SecurityUtil
.
getUser
();
RobotSecurityUser
loginUser
=
SecurityUtil
.
getUser
();
String
userId
=
loginUser
.
getUserId
(
);
String
userId
=
String
.
format
(
"%08d"
,
loginUser
.
getUserId
()
);
List
<
MeetTypeDto
>
meetTypeDtoList
=
meetTypeMapper
.
selectCustomMeetTypeList
(
userId
);
List
<
MeetTypeDto
>
meetTypeDtoList
=
meetTypeMapper
.
selectCustomMeetTypeList
(
userId
);
meetTypeDtoList
.
stream
().
forEach
(
meetTypeDto
->
meetTypeDto
.
setType
(
MeetingTypeConstant
.
TYPE_CUSTOM
));
meetTypeDtoList
.
stream
().
forEach
(
meetTypeDto
->
meetTypeDto
.
setType
(
MeetingTypeConstant
.
TYPE_CUSTOM
));
...
...
src/main/java/com/cmeeting/service/impl/MeetingRecordTemplateServiceImpl.java
浏览文件 @
17588e65
...
@@ -283,8 +283,8 @@ public class MeetingRecordTemplateServiceImpl extends ServiceImpl<MeetingRecordT
...
@@ -283,8 +283,8 @@ public class MeetingRecordTemplateServiceImpl extends ServiceImpl<MeetingRecordT
recordTemplate
.
setReferTemplateId
(
recordTemplateVo
.
getReferTemplateId
());
recordTemplate
.
setReferTemplateId
(
recordTemplateVo
.
getReferTemplateId
());
recordTemplate
.
setCreateTime
(
now
);
recordTemplate
.
setCreateTime
(
now
);
recordTemplate
.
setUpdateTime
(
now
);
recordTemplate
.
setUpdateTime
(
now
);
recordTemplate
.
setCreateUser
(
loginUser
.
getUserId
(
));
recordTemplate
.
setCreateUser
(
String
.
format
(
"%08d"
,
loginUser
.
getUserId
()
));
recordTemplate
.
setUpdateUser
(
loginUser
.
getUserId
(
));
recordTemplate
.
setUpdateUser
(
String
.
format
(
"%08d"
,
loginUser
.
getUserId
()
));
recordTemplate
.
setCreateUserName
(
loginUser
.
getUsername
());
recordTemplate
.
setCreateUserName
(
loginUser
.
getUsername
());
recordTemplate
.
setUpdateUserName
(
loginUser
.
getUsername
());
recordTemplate
.
setUpdateUserName
(
loginUser
.
getUsername
());
baseMapper
.
insert
(
recordTemplate
);
baseMapper
.
insert
(
recordTemplate
);
...
@@ -324,7 +324,7 @@ public class MeetingRecordTemplateServiceImpl extends ServiceImpl<MeetingRecordT
...
@@ -324,7 +324,7 @@ public class MeetingRecordTemplateServiceImpl extends ServiceImpl<MeetingRecordT
@Override
@Override
public
void
enable
(
Long
id
)
{
public
void
enable
(
Long
id
)
{
RobotSecurityUser
loginUser
=
SecurityUtil
.
getUser
();
RobotSecurityUser
loginUser
=
SecurityUtil
.
getUser
();
String
userId
=
loginUser
.
getUserId
(
);
String
userId
=
String
.
format
(
"%08d"
,
loginUser
.
getUserId
()
);
MeetingRecordTemplate
recordTemplate
=
baseMapper
.
selectOne
(
new
QueryWrapper
<
MeetingRecordTemplate
>().
select
(
"meeting_type"
)
MeetingRecordTemplate
recordTemplate
=
baseMapper
.
selectOne
(
new
QueryWrapper
<
MeetingRecordTemplate
>().
select
(
"meeting_type"
)
.
eq
(
"rel_id"
,
id
));
.
eq
(
"rel_id"
,
id
));
...
@@ -365,21 +365,21 @@ public class MeetingRecordTemplateServiceImpl extends ServiceImpl<MeetingRecordT
...
@@ -365,21 +365,21 @@ public class MeetingRecordTemplateServiceImpl extends ServiceImpl<MeetingRecordT
public
List
<
RecordTemplateDto
>
getTemplateSelect
()
{
public
List
<
RecordTemplateDto
>
getTemplateSelect
()
{
// 获取当前用户向上的的部门集合
// 获取当前用户向上的的部门集合
RobotSecurityUser
loginUser
=
SecurityUtil
.
getUser
();
RobotSecurityUser
loginUser
=
SecurityUtil
.
getUser
();
List
<
SysUserSyncCategory
>
categoryList
=
sysUserSyncService
.
getCategoryListByUserId
(
loginUser
.
getUserId
(
));
List
<
SysUserSyncCategory
>
categoryList
=
sysUserSyncService
.
getCategoryListByUserId
(
String
.
format
(
"%08d"
,
loginUser
.
getUserId
()
));
List
<
String
>
parentDeptIdList
=
categoryList
.
stream
().
map
(
SysUserSyncCategory:
:
getDeptId
).
collect
(
Collectors
.
toList
());
List
<
String
>
parentDeptIdList
=
categoryList
.
stream
().
map
(
SysUserSyncCategory:
:
getDeptId
).
collect
(
Collectors
.
toList
());
List
<
RecordTemplateDto
>
resultList
=
new
ArrayList
<>();
List
<
RecordTemplateDto
>
resultList
=
new
ArrayList
<>();
// 查询指定授权的模板 - 从会议类型维度查询
// 查询指定授权的模板 - 从会议类型维度查询
List
<
RecordTemplateDto
>
permissionTmplInMeetTypeDtoList
=
baseMapper
.
selectPermissionTmplInMeetType
(
loginUser
.
getUserId
(
),
parentDeptIdList
);
List
<
RecordTemplateDto
>
permissionTmplInMeetTypeDtoList
=
baseMapper
.
selectPermissionTmplInMeetType
(
String
.
format
(
"%08d"
,
loginUser
.
getUserId
()
),
parentDeptIdList
);
resultList
.
addAll
(
permissionTmplInMeetTypeDtoList
);
resultList
.
addAll
(
permissionTmplInMeetTypeDtoList
);
// 查询指定授权的模板 - 从纪要模板维度查询
// 查询指定授权的模板 - 从纪要模板维度查询
List
<
RecordTemplateDto
>
permissionDeptTmplDtoList
=
baseMapper
.
selectPermissionTmpl
(
loginUser
.
getUserId
(
),
parentDeptIdList
);
List
<
RecordTemplateDto
>
permissionDeptTmplDtoList
=
baseMapper
.
selectPermissionTmpl
(
String
.
format
(
"%08d"
,
loginUser
.
getUserId
()
),
parentDeptIdList
);
resultList
.
addAll
(
permissionDeptTmplDtoList
);
resultList
.
addAll
(
permissionDeptTmplDtoList
);
// 获取非授权的模板,包括系统通用的和自己创建的
// 获取非授权的模板,包括系统通用的和自己创建的
List
<
RecordTemplateDto
>
recordTemplateDtoList
=
baseMapper
.
selectAllTmplWithoutPermission
(
loginUser
.
getUserId
(
));
List
<
RecordTemplateDto
>
recordTemplateDtoList
=
baseMapper
.
selectAllTmplWithoutPermission
(
String
.
format
(
"%08d"
,
loginUser
.
getUserId
()
));
resultList
.
addAll
(
recordTemplateDtoList
);
resultList
.
addAll
(
recordTemplateDtoList
);
return
resultList
;
return
resultList
;
...
...
src/main/resources/application.yml
浏览文件 @
17588e65
...
@@ -2,10 +2,10 @@ server:
...
@@ -2,10 +2,10 @@ server:
port
:
8105
port
:
8105
############################################################## minio
############################################################## minio
MINIO_ADDRESS
:
http://192.168.10.
50:9001
MINIO_ADDRESS
:
http://192.168.10.
153:9000
MINIO_BUCKET
:
zhongji
MINIO_BUCKET
:
zhongji
MINIO_USERNAME
:
aigc
MINIO_USERNAME
:
qizhi
MINIO_PASSWORD
:
aigc1qaz2wsx
MINIO_PASSWORD
:
qizhi123
############################################################## redis
############################################################## redis
REDIS_ADDRESS
:
192.168.10.157
REDIS_ADDRESS
:
192.168.10.157
REDIS_PORT
:
6379
REDIS_PORT
:
6379
...
@@ -35,7 +35,7 @@ EMAIL_SMTP_HOST: smtp.office365.com
...
@@ -35,7 +35,7 @@ EMAIL_SMTP_HOST: smtp.office365.com
############################################################## permission
############################################################## permission
PERMISSION_APPLiCATION_ID
:
1945681039926104064
PERMISSION_APPLiCATION_ID
:
1945681039926104064
PERMISSION_TENANT_ID
:
1945678078692954112
PERMISSION_TENANT_ID
:
1945678078692954112
PERMISSION_ADMIN_WHITE_USERS
:
000
01
,1945678083671592960
PERMISSION_ADMIN_WHITE_USERS
:
000
15545
,1945678083671592960
spring
:
spring
:
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论