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