rev:大屏操作面板
This commit is contained in:
zhangzq
@@ -6,6 +6,25 @@ spring:
|
||||
exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
|
||||
datasource:
|
||||
dynamic:
|
||||
druid:
|
||||
filters:
|
||||
DruidFilter,stat
|
||||
initial-size: 5 #初始化时建立物理连接的个数
|
||||
min-idle: 15 #最小连接池数量
|
||||
maxActive: 30 #最大连接池数量
|
||||
maxWait: 3000 #获取连接时最大等待时间，单位毫秒
|
||||
#申请连接的时候检测，如果空闲时间大于timeBetweenEvictionRunsMillis，执行validationQuery检测连接是否有效。
|
||||
test-while-idle: true
|
||||
time-between-eviction-runs-millis: 300000 #既作为检测的间隔时间又作为test-while-idle执行的依据
|
||||
min-evictable-idle-time-millis: 900000 #销毁线程时检测当前连接的最后活动时间和当前时间差大于该值时，关闭当前连接
|
||||
#用来检测连接是否有效的sql
|
||||
#mysql中为 select 'x'
|
||||
#oracle中为 select 1 from dual
|
||||
validation-query: SELECT 'x' FROM DUAL
|
||||
test-on-borrow: true #申请连接时会执行validationQuery检测连接是否有效,开启会降低性能,默认为true
|
||||
test-on-return: false #归还连接时会执行validationQuery检测连接是否有效,开启会降低性能,默认为true
|
||||
pool-prepared-statements: true #是否缓存preparedStatement,mysql5.5+建议开启
|
||||
max-pool-prepared-statement-per-connection-size: 20 #当值大于20时poolPreparedStatements会自动修改为true
|
||||
primary: mysql
|
||||
datasource:
|
||||
mysql:
|
||||
@@ -20,25 +39,7 @@ spring:
|
||||
# username: ${DB_USER:sa}
|
||||
# password: ${DB_PWD:123}
|
||||
# type: com.alibaba.druid.pool.DruidDataSource
|
||||
druid:
|
||||
filters:
|
||||
DruidFilter,stat
|
||||
initial-size: 5 #初始化时建立物理连接的个数
|
||||
min-idle: 15 #最小连接池数量
|
||||
maxActive: 30 #最大连接池数量
|
||||
maxWait: 3000 #获取连接时最大等待时间，单位毫秒
|
||||
#申请连接的时候检测，如果空闲时间大于timeBetweenEvictionRunsMillis，执行validationQuery检测连接是否有效。
|
||||
test-while-idle: true
|
||||
time-between-eviction-runs-millis: 300000 #既作为检测的间隔时间又作为test-while-idle执行的依据
|
||||
min-evictable-idle-time-millis: 900000 #销毁线程时检测当前连接的最后活动时间和当前时间差大于该值时，关闭当前连接
|
||||
#用来检测连接是否有效的sql
|
||||
#mysql中为 select 'x'
|
||||
#oracle中为 select 1 from dual
|
||||
validation-query: SELECT 'x' FROM DUAL
|
||||
test-on-borrow: true #申请连接时会执行validationQuery检测连接是否有效,开启会降低性能,默认为true
|
||||
test-on-return: false #归还连接时会执行validationQuery检测连接是否有效,开启会降低性能,默认为true
|
||||
pool-prepared-statements: true #是否缓存preparedStatement,mysql5.5+建议开启
|
||||
max-pool-prepared-statement-per-connection-size: 20 #当值大于20时poolPreparedStatements会自动修改为true
|
||||
|
||||
redis:
|
||||
#数据库索引
|
||||
database: ${REDIS_DB:2}
|
||||
|
||||
@@ -1,3 +1,9 @@
|
||||
ALTER TABLE sch_base_vehiclematerialgroup
|
||||
ADD COLUMN `due_date` varchar(63) DEFAULT null COMMENT '交期';
|
||||
ADD COLUMN `has_work` tinyint(1) DEFAULT 0 COMMENT '当前工序已加工判断防止重复生产';
|
||||
ADD COLUMN `has_work` tinyint(1) DEFAULT 0 COMMENT '当前工序已加工判断防止重复生产';
|
||||
|
||||
-- 添加任务配置：pc操作
|
||||
INSERT INTO `sch_base_taskconfig`(`config_id`, `config_code`, `config_name`, `route_plan_code`, `task_qf_type`, `acs_task_type`, `task_name`, `task_type`, `task_direction`, `priority`, `task_create_max_num`, `task_issue_max_num`, `is_auto_issue`, `start_region_str`, `next_region_str`, `start_point_pre`, `next_region_pre`, `is_check_workorder`, `is_check_start_lock`, `is_immediate_create`, `is_check_next_lock`, `is_start_auto`, `is_next_auto`, `is_lock_start`, `is_lock_next`, `request_param`, `response_param`, `is_group_congrol_issue_seq`, `unfinish_notify_time`, `sql_param`, `workshop_code`, `remark`, `is_used`, `is_delete`, `create_id`, `create_name`, `create_time`, `update_id`, `update_name`, `update_time`) VALUES ('1821425240866164741', 'PcOperationCNTask', 'pc呼叫空托', NULL, '1', '1', 'pc呼叫空托', '1', '2', '1', 1, 1, 1, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 1, 1, 0, 1, NULL, NULL, 0, 0, NULL, 'A1', NULL, 1, 0, '1', '管理员', '2024-08-08 13:56:32', '1', '管理员', '2024-08-08 17:17:54');
|
||||
INSERT INTO `sch_base_taskconfig`(`config_id`, `config_code`, `config_name`, `route_plan_code`, `task_qf_type`, `acs_task_type`, `task_name`, `task_type`, `task_direction`, `priority`, `task_create_max_num`, `task_issue_max_num`, `is_auto_issue`, `start_region_str`, `next_region_str`, `start_point_pre`, `next_region_pre`, `is_check_workorder`, `is_check_start_lock`, `is_immediate_create`, `is_check_next_lock`, `is_start_auto`, `is_next_auto`, `is_lock_start`, `is_lock_next`, `request_param`, `response_param`, `is_group_congrol_issue_seq`, `unfinish_notify_time`, `sql_param`, `workshop_code`, `remark`, `is_used`, `is_delete`, `create_id`, `create_name`, `create_time`, `update_id`, `update_name`, `update_time`) VALUES ('1821425465571807242', 'PcOperationCMTask', 'pc呼叫满托', NULL, '1', '1', 'pc呼叫满托', '1', '2', '1', 1, 1, 1, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 1, 1, 1, 1, NULL, NULL, 0, 0, NULL, 'A1', NULL, 1, 0, '1', '管理员', '2024-08-08 13:57:26', '1', '管理员', '2024-08-09 08:58:16');
|
||||
INSERT INTO `sch_base_taskconfig`(`config_id`, `config_code`, `config_name`, `route_plan_code`, `task_qf_type`, `acs_task_type`, `task_name`, `task_type`, `task_direction`, `priority`, `task_create_max_num`, `task_issue_max_num`, `is_auto_issue`, `start_region_str`, `next_region_str`, `start_point_pre`, `next_region_pre`, `is_check_workorder`, `is_check_start_lock`, `is_immediate_create`, `is_check_next_lock`, `is_start_auto`, `is_next_auto`, `is_lock_start`, `is_lock_next`, `request_param`, `response_param`, `is_group_congrol_issue_seq`, `unfinish_notify_time`, `sql_param`, `workshop_code`, `remark`, `is_used`, `is_delete`, `create_id`, `create_name`, `create_time`, `update_id`, `update_name`, `update_time`) VALUES ('1821425816614080543', 'PcOperationSNTTask', 'pc送空托盘', NULL, '2', '1', 'pc送空托盘', '1', '1', '1', 1, 1, 1, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 1, 0, 0, 0, NULL, NULL, 0, 0, NULL, 'A1', NULL, 1, 0, '1', '管理员', '2024-08-08 13:58:49', '1', '管理员', '2024-08-08 16:17:58');
|
||||
INSERT INTO `sch_base_taskconfig`(`config_id`, `config_code`, `config_name`, `route_plan_code`, `task_qf_type`, `acs_task_type`, `task_name`, `task_type`, `task_direction`, `priority`, `task_create_max_num`, `task_issue_max_num`, `is_auto_issue`, `start_region_str`, `next_region_str`, `start_point_pre`, `next_region_pre`, `is_check_workorder`, `is_check_start_lock`, `is_immediate_create`, `is_check_next_lock`, `is_start_auto`, `is_next_auto`, `is_lock_start`, `is_lock_next`, `request_param`, `response_param`, `is_group_congrol_issue_seq`, `unfinish_notify_time`, `sql_param`, `workshop_code`, `remark`, `is_used`, `is_delete`, `create_id`, `create_name`, `create_time`, `update_id`, `update_name`, `update_time`) VALUES ('1821426120634011644', 'PcOperationSMTTask', 'pc送满下料', NULL, '2', '1', 'pc送满下料', '1', '1', '1', 3, 3, 1, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 1, 1, 0, 0, NULL, NULL, 0, 0, NULL, 'A1', NULL, 1, 0, '1', '管理员', '2024-08-08 14:00:02', '1', '管理员', '2024-08-08 15:31:51');
|
||||
Reference in New Issue
Block a user