会议室预约审批人角色改为会议室审核人
This commit is contained in:
zhangzhikang
parent
f72463d3bf
commit
7169d9ee73
|
|
@ -37,10 +37,8 @@ public class BookMeetingRoomController {
|
||||||
|
|
||||||
@Value("${big_date.name}")
|
@Value("${big_date.name}")
|
||||||
private String bigDateDeptName; // 大数据局名称
|
private String bigDateDeptName; // 大数据局名称
|
||||||
@Value("${big_date.default_assignee_role_id}")
|
@Value("${big_date.assignee_meet_role_id}")
|
||||||
private String defaultAssigneeRoleId; // 当某部门未设置部门审批人时，将使用该用户审批
|
private String defaultAssigneeRoleId; // 改成配置的会议室审核人
|
||||||
@Value("${big_date.assignee_role_name}")
|
|
||||||
private String roleName; // 具备审批的角色名称
|
|
||||||
|
|
||||||
@Resource
|
@Resource
|
||||||
private TMeetingroomBookService tMeetingroomBookService;
|
private TMeetingroomBookService tMeetingroomBookService;
|
||||||
|
|
@ -106,6 +104,7 @@ public class BookMeetingRoomController {
|
||||||
sysNoticeDTO.setTitle("会议室申请审核通知");
|
sysNoticeDTO.setTitle("会议室申请审核通知");
|
||||||
sysNoticeDTO.setContent(content); // 通知内容
|
sysNoticeDTO.setContent(content); // 通知内容
|
||||||
sysNoticeDTO.setReceiverType(1);
|
sysNoticeDTO.setReceiverType(1);
|
||||||
|
|
||||||
sysNoticeDTO.setReceiverTypeIds(defaultAssigneeRoleId);
|
sysNoticeDTO.setReceiverTypeIds(defaultAssigneeRoleId);
|
||||||
sysNoticeDTO.setStatus(NoticeStatusEnum.SEND.value());
|
sysNoticeDTO.setStatus(NoticeStatusEnum.SEND.value());
|
||||||
sysNoticeDTO.setSenderName("流程系统");
|
sysNoticeDTO.setSenderName("流程系统");
|
||||||
|
|
@ -116,7 +115,7 @@ public class BookMeetingRoomController {
|
||||||
sysNoticeService.save(sysNoticeDTO);
|
sysNoticeService.save(sysNoticeDTO);
|
||||||
// 还要发送自己能看到的的谁给我审核的消息
|
// 还要发送自己能看到的的谁给我审核的消息
|
||||||
String ownedContent = "【通知】您发起的" + dto.getRoomName() +
|
String ownedContent = "【通知】您发起的" + dto.getRoomName() +
|
||||||
"会议室申请,当前审核部门为：" + bigDateDeptName + "，审核负责人：" + roleName;
|
"会议室申请,当前审核部门为：" + bigDateDeptName + "，审核负责人：会议室管理员" ;
|
||||||
SysNoticeDTO ownedSysNoticeDTO = new SysNoticeDTO();
|
SysNoticeDTO ownedSysNoticeDTO = new SysNoticeDTO();
|
||||||
ownedSysNoticeDTO.setType(2);
|
ownedSysNoticeDTO.setType(2);
|
||||||
ownedSysNoticeDTO.setTitle("会议室申请发起通知");
|
ownedSysNoticeDTO.setTitle("会议室申请发起通知");
|
||||||
|
|
|
||||||
|
|
@ -1,151 +1,153 @@
|
||||||
project:
|
project:
|
||||||
# 平台部署位置 0：青岛市区 1：青岛西海岸 2：包头
|
# 平台部署位置 0：青岛市区 1：青岛西海岸 2：包头
|
||||||
place: 0
|
place: 0
|
||||||
# 是否将资源归为上级
|
# 是否将资源归为上级
|
||||||
higher: false
|
higher: false
|
||||||
# cim 住建局单位名称
|
# cim 住建局单位名称
|
||||||
cim:
|
cim:
|
||||||
zjj: 青岛市住房和城乡建设局
|
zjj: 青岛市住房和城乡建设局
|
||||||
# 大数据部门相关配置
|
# 大数据部门相关配置
|
||||||
big_date:
|
big_date:
|
||||||
name: 青岛市大数据发展管理局
|
name: 青岛市大数据发展管理局
|
||||||
assignee_role_name: 部门审批人
|
assignee_role_name: 部门审批人
|
||||||
assignee_district_role_name: 区审批人
|
assignee_district_role_name: 区审批人
|
||||||
assignee_city_role_name: 市审批人
|
assignee_city_role_name: 市审批人
|
||||||
# 当某部门未设置部门审批人时，将使用该用户审批
|
# 当某部门未设置部门审批人时，将使用该用户审批
|
||||||
default_assignee_role_id: 1516728698224427010
|
default_assignee_role_id: 1516728698224427010
|
||||||
# 需要进行统计数目的资源 type/需要进行统计申请的资源类型 applyType
|
# 会议室审核员
|
||||||
census:
|
assignee_meet_role_id: 1576849766277849089
|
||||||
type: 组件服务,应用资源,基础设施,数据资源,知识库
|
# 需要进行统计数目的资源 type/需要进行统计申请的资源类型 applyType
|
||||||
applyType: 应用资源,业务组件,图层服务,开发组件,智能算法
|
census:
|
||||||
# 海信网关
|
type: 组件服务,应用资源,基础设施,数据资源,知识库
|
||||||
hisense:
|
applyType: 应用资源,业务组件,图层服务,开发组件,智能算法
|
||||||
gateway:
|
# 海信网关
|
||||||
sync-enabled: true
|
hisense:
|
||||||
name: 聚好看网关
|
gateway:
|
||||||
url: http://devtest-security-app.hismarttv.com:8080
|
sync-enabled: true
|
||||||
dp-url: http://devtest-security-app.hismarttv.com:8080
|
name: 聚好看网关
|
||||||
# Tomcat
|
url: http://devtest-security-app.hismarttv.com:8080
|
||||||
server:
|
dp-url: http://devtest-security-app.hismarttv.com:8080
|
||||||
tomcat:
|
# Tomcat
|
||||||
uri-encoding: UTF-8
|
server:
|
||||||
threads:
|
tomcat:
|
||||||
max: 1000
|
uri-encoding: UTF-8
|
||||||
min-spare: 30
|
threads:
|
||||||
port: 9090
|
max: 1000
|
||||||
servlet:
|
min-spare: 30
|
||||||
context-path: /renren-admin
|
port: 9090
|
||||||
session:
|
servlet:
|
||||||
cookie:
|
context-path: /renren-admin
|
||||||
http-only: true
|
session:
|
||||||
compression:
|
cookie:
|
||||||
enabled: true
|
http-only: true
|
||||||
mime-types: application/json
|
compression:
|
||||||
spring:
|
enabled: true
|
||||||
# 环境 dev|test|prod|show
|
mime-types: application/json
|
||||||
profiles:
|
spring:
|
||||||
active: dev
|
# 环境 dev|test|prod|show
|
||||||
messages:
|
profiles:
|
||||||
encoding: UTF-8
|
active: dev
|
||||||
basename: i18n/messages
|
messages:
|
||||||
servlet:
|
encoding: UTF-8
|
||||||
multipart:
|
basename: i18n/messages
|
||||||
max-file-size: 100MB
|
servlet:
|
||||||
max-request-size: 100MB
|
multipart:
|
||||||
enabled: true
|
max-file-size: 100MB
|
||||||
redis:
|
max-request-size: 100MB
|
||||||
database: 0
|
enabled: true
|
||||||
host: 127.0.0.1
|
redis:
|
||||||
port: 6379
|
database: 0
|
||||||
password: # 密码（默认为空）
|
host: 127.0.0.1
|
||||||
timeout: 6000ms # 连接超时时长（毫秒）
|
port: 6379
|
||||||
jedis:
|
password: # 密码（默认为空）
|
||||||
pool:
|
timeout: 6000ms # 连接超时时长（毫秒）
|
||||||
max-active: 1000 # 连接池最大连接数（使用负值表示没有限制）
|
jedis:
|
||||||
max-wait: -1ms # 连接池最大阻塞等待时间（使用负值表示没有限制）
|
pool:
|
||||||
max-idle: 10 # 连接池中的最大空闲连接
|
max-active: 1000 # 连接池最大连接数（使用负值表示没有限制）
|
||||||
min-idle: 5 # 连接池中的最小空闲连接
|
max-wait: -1ms # 连接池最大阻塞等待时间（使用负值表示没有限制）
|
||||||
activiti:
|
max-idle: 10 # 连接池中的最大空闲连接
|
||||||
check-process-definitions: false
|
min-idle: 5 # 连接池中的最小空闲连接
|
||||||
resources:
|
activiti:
|
||||||
static-locations: classpath:/static,classpath:/public,file:${resource.path},file:${resource.devModelFilePath}
|
check-process-definitions: false
|
||||||
flyway:
|
resources:
|
||||||
enabled: true
|
static-locations: classpath:/static,classpath:/public,file:${resource.path},file:${resource.devModelFilePath}
|
||||||
locations: filesystem:config/db
|
flyway:
|
||||||
baseline-on-migrate: true
|
enabled: true
|
||||||
baseline-version: 0
|
locations: filesystem:config/db
|
||||||
validate-on-migrate: true
|
baseline-on-migrate: true
|
||||||
jackson:
|
baseline-version: 0
|
||||||
parser:
|
validate-on-migrate: true
|
||||||
# 允许出现特殊字符和转义符
|
jackson:
|
||||||
allow_unquoted_control_chars: true
|
parser:
|
||||||
#允许出现单引号
|
# 允许出现特殊字符和转义符
|
||||||
allow_single_quotes: true
|
allow_unquoted_control_chars: true
|
||||||
|
#允许出现单引号
|
||||||
fdfs:
|
allow_single_quotes: true
|
||||||
so-timeout: 600000
|
|
||||||
connect-timeout: 6000
|
fdfs:
|
||||||
tracker-list: #TrackerList参数,支持多个
|
so-timeout: 600000
|
||||||
- 192.168.10.10:22122
|
connect-timeout: 6000
|
||||||
|
tracker-list: #TrackerList参数,支持多个
|
||||||
# 是否开启redis缓存 true开启 false关闭
|
- 192.168.10.10:22122
|
||||||
renren.redis.open: false
|
|
||||||
|
# 是否开启redis缓存 true开启 false关闭
|
||||||
#mybatis
|
renren.redis.open: false
|
||||||
mybatis-plus:
|
|
||||||
mapper-locations: classpath*:/mapper/**/*.xml
|
#mybatis
|
||||||
#实体扫描，多个package用逗号或者分号分隔
|
mybatis-plus:
|
||||||
typeAliasesPackage: io.renren.modules.*.entity
|
mapper-locations: classpath*:/mapper/**/*.xml
|
||||||
global-config:
|
#实体扫描，多个package用逗号或者分号分隔
|
||||||
#数据库相关配置
|
typeAliasesPackage: io.renren.modules.*.entity
|
||||||
db-config:
|
global-config:
|
||||||
#主键类型 AUTO:"数据库ID自增", INPUT:"用户输入ID", ID_WORKER:"全局唯一ID (数字类型唯一ID)", UUID:"全局唯一ID UUID";
|
#数据库相关配置
|
||||||
id-type: ID_WORKER
|
db-config:
|
||||||
banner: false
|
#主键类型 AUTO:"数据库ID自增", INPUT:"用户输入ID", ID_WORKER:"全局唯一ID (数字类型唯一ID)", UUID:"全局唯一ID UUID";
|
||||||
#原生配置
|
id-type: ID_WORKER
|
||||||
configuration:
|
banner: false
|
||||||
map-underscore-to-camel-case: true
|
#原生配置
|
||||||
cache-enabled: false
|
configuration:
|
||||||
call-setters-on-nulls: true
|
map-underscore-to-camel-case: true
|
||||||
jdbc-type-for-null: 'null'
|
cache-enabled: false
|
||||||
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
|
call-setters-on-nulls: true
|
||||||
|
jdbc-type-for-null: 'null'
|
||||||
#系统上线日期，用于统计能力浏览记录
|
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
|
||||||
system:
|
|
||||||
startDay: 2022-04-01
|
#系统上线日期，用于统计能力浏览记录
|
||||||
|
system:
|
||||||
yawei:
|
startDay: 2022-04-01
|
||||||
enable: true
|
|
||||||
|
yawei:
|
||||||
#对接知识库相关配置
|
enable: true
|
||||||
zsk:
|
|
||||||
url:
|
#对接知识库相关配置
|
||||||
sign: https://cms.qingdao.gov.cn:9020/api-gateway/jpaas-jags-server/interface/createsign.do
|
zsk:
|
||||||
gateway: https://cms.qingdao.gov.cn:9020/api-gateway/jpaas-jags-server/interface/gateway
|
url:
|
||||||
appid: hxszzt
|
sign: https://cms.qingdao.gov.cn:9020/api-gateway/jpaas-jags-server/interface/createsign.do
|
||||||
appkey: 120d6a3cc2cd45096abaa5700cb19d0779d5f22ff683436e6d3a7ff8a8d66f5e8307f31b192281831e9f6dc0b6a1f308
|
gateway: https://cms.qingdao.gov.cn:9020/api-gateway/jpaas-jags-server/interface/gateway
|
||||||
param:
|
appid: hxszzt
|
||||||
charset: UTF-8
|
appkey: 120d6a3cc2cd45096abaa5700cb19d0779d5f22ff683436e6d3a7ff8a8d66f5e8307f31b192281831e9f6dc0b6a1f308
|
||||||
origin: 0
|
param:
|
||||||
version: 1.0
|
charset: UTF-8
|
||||||
methodId: jirdGetInfoByCatalog
|
origin: 0
|
||||||
catalogIds: c0645e03fb7e4cf3842e9ceedd8ab998,f49561afc7204f008c4bb3cd821eb6ba
|
version: 1.0
|
||||||
|
methodId: jirdGetInfoByCatalog
|
||||||
sso:
|
catalogIds: c0645e03fb7e4cf3842e9ceedd8ab998,f49561afc7204f008c4bb3cd821eb6ba
|
||||||
mode: yawei # 取值 yawei,cas,不填时为禁用sso
|
|
||||||
|
sso:
|
||||||
cas:
|
mode: yawei # 取值 yawei,cas,不填时为禁用sso
|
||||||
server-url-prefix: http://10.134.135.81:11188/cas
|
|
||||||
server-login-url: http://10.134.135.81:11188/cas/login
|
cas:
|
||||||
server-logout-url: http://10.134.135.81:11188/cas/logout
|
server-url-prefix: http://10.134.135.81:11188/cas
|
||||||
client-host-url: http://localhost:9999/#/
|
server-login-url: http://10.134.135.81:11188/cas/login
|
||||||
use-session: false
|
server-logout-url: http://10.134.135.81:11188/cas/logout
|
||||||
validation-type: cas3
|
client-host-url: http://localhost:9999/#/
|
||||||
# 前端地址，用于退出登录后的重定向
|
use-session: false
|
||||||
front:
|
validation-type: cas3
|
||||||
url: http://10.16.16.159:4444
|
# 前端地址，用于退出登录后的重定向
|
||||||
|
front:
|
||||||
# 基础设施，部门最大申请数量
|
url: http://10.16.16.159:4444
|
||||||
infrastructure:
|
|
||||||
dept-can-apply-max: 10
|
# 基础设施，部门最大申请数量
|
||||||
|
infrastructure:
|
||||||
|
dept-can-apply-max: 10
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue