manager/my-worker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
thinkgem
2021-12-03 20:40:41 +08:00
parent 09ca6c68a9
commit f195e1f120
12 changed files with 268 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
modules/core/db/db2/core.sql
View File

@@ -121,6 +121,7 @@ CREATE TABLE js_sys_company
extend_d2 timestamp,
extend_d3 timestamp,
extend_d4 timestamp,
extend_json clob,
PRIMARY KEY (company_code)
);
@@ -198,6 +199,7 @@ CREATE TABLE js_sys_dict_data
extend_d2 timestamp,
extend_d3 timestamp,
extend_d4 timestamp,
extend_json clob,
PRIMARY KEY (dict_code)
);
@@ -313,6 +315,7 @@ CREATE TABLE js_sys_file_upload
extend_d2 timestamp,
extend_d3 timestamp,
extend_d4 timestamp,
extend_json clob,
PRIMARY KEY (id)
);
@@ -423,6 +426,8 @@ CREATE TABLE js_sys_menu
is_show char(1) NOT NULL,
sys_code varchar(64) NOT NULL,
module_codes varchar(500) NOT NULL,
component varchar(500),
params varchar(500),
status char(1) DEFAULT '0' NOT NULL,
create_by varchar(64) NOT NULL,
create_date timestamp NOT NULL,
@@ -449,6 +454,7 @@ CREATE TABLE js_sys_menu
extend_d2 timestamp,
extend_d3 timestamp,
extend_d4 timestamp,
extend_json clob,
PRIMARY KEY (menu_code)
);
@@ -637,6 +643,7 @@ CREATE TABLE js_sys_office
extend_d2 timestamp,
extend_d3 timestamp,
extend_d4 timestamp,
extend_json clob,
PRIMARY KEY (office_code)
);
@@ -645,6 +652,7 @@ CREATE TABLE js_sys_office
CREATE TABLE js_sys_post
(
post_code varchar(64) NOT NULL,
view_code varchar(100),
post_name varchar(100) NOT NULL,
post_type varchar(100),
post_sort decimal(10),
@@ -665,6 +673,7 @@ CREATE TABLE js_sys_role
(
role_code varchar(64) NOT NULL,
role_name varchar(100) NOT NULL,
view_code varchar(100),
role_type varchar(100),
role_sort decimal(10),
is_sys char(1),
@@ -699,6 +708,7 @@ CREATE TABLE js_sys_role
extend_d2 timestamp,
extend_d3 timestamp,
extend_d4 timestamp,
extend_json clob,
PRIMARY KEY (role_code)
);
@@ -785,6 +795,7 @@ CREATE TABLE js_sys_user
extend_d2 timestamp,
extend_d3 timestamp,
extend_d4 timestamp,
extend_json clob,
PRIMARY KEY (user_code)
);

11
modules/core/db/h2/core.sql
View File

@@ -121,6 +121,7 @@ CREATE TABLE js_sys_company
extend_d2 datetime,
extend_d3 datetime,
extend_d4 datetime,
extend_json clob,
PRIMARY KEY (company_code)
);
@@ -198,6 +199,7 @@ CREATE TABLE js_sys_dict_data
extend_d2 datetime,
extend_d3 datetime,
extend_d4 datetime,
extend_json clob,
PRIMARY KEY (dict_code)
);
@@ -313,6 +315,7 @@ CREATE TABLE js_sys_file_upload
extend_d2 datetime,
extend_d3 datetime,
extend_d4 datetime,
extend_json clob,
PRIMARY KEY (id)
);
@@ -423,6 +426,8 @@ CREATE TABLE js_sys_menu
is_show char(1) NOT NULL,
sys_code varchar(64) NOT NULL,
module_codes varchar(500) NOT NULL,
component varchar(500),
params varchar(500),
status char(1) DEFAULT '0' NOT NULL,
create_by varchar(64) NOT NULL,
create_date datetime NOT NULL,
@@ -449,6 +454,7 @@ CREATE TABLE js_sys_menu
extend_d2 datetime,
extend_d3 datetime,
extend_d4 datetime,
extend_json clob,
PRIMARY KEY (menu_code)
);
@@ -637,6 +643,7 @@ CREATE TABLE js_sys_office
extend_d2 datetime,
extend_d3 datetime,
extend_d4 datetime,
extend_json clob,
PRIMARY KEY (office_code)
);
@@ -645,6 +652,7 @@ CREATE TABLE js_sys_office
CREATE TABLE js_sys_post
(
post_code varchar(64) NOT NULL,
view_code varchar(100),
post_name varchar(100) NOT NULL,
post_type varchar(100),
post_sort decimal(10),
@@ -665,6 +673,7 @@ CREATE TABLE js_sys_role
(
role_code varchar(64) NOT NULL,
role_name varchar(100) NOT NULL,
view_code varchar(100),
role_type varchar(100),
role_sort decimal(10),
is_sys char(1),
@@ -699,6 +708,7 @@ CREATE TABLE js_sys_role
extend_d2 datetime,
extend_d3 datetime,
extend_d4 datetime,
extend_json clob,
PRIMARY KEY (role_code)
);
@@ -785,6 +795,7 @@ CREATE TABLE js_sys_user
extend_d2 datetime,
extend_d3 datetime,
extend_d4 datetime,
extend_json clob,
PRIMARY KEY (user_code)
);

11
modules/core/db/mssql/core.sql
View File

@@ -121,6 +121,7 @@ CREATE TABLE [js_sys_company]
[extend_d2] datetime,
[extend_d3] datetime,
[extend_d4] datetime,
[extend_json] text,
PRIMARY KEY ([company_code])
);
@@ -198,6 +199,7 @@ CREATE TABLE [js_sys_dict_data]
[extend_d2] datetime,
[extend_d3] datetime,
[extend_d4] datetime,
[extend_json] text,
PRIMARY KEY ([dict_code])
);
@@ -313,6 +315,7 @@ CREATE TABLE [js_sys_file_upload]
[extend_d2] datetime,
[extend_d3] datetime,
[extend_d4] datetime,
[extend_json] text,
PRIMARY KEY ([id])
);
@@ -423,6 +426,8 @@ CREATE TABLE [js_sys_menu]
[is_show] char(1) NOT NULL,
[sys_code] varchar(64) NOT NULL,
[module_codes] varchar(500) NOT NULL,
[component] varchar(500),
[params] varchar(500),
[status] char(1) DEFAULT '0' NOT NULL,
[create_by] varchar(64) NOT NULL,
[create_date] datetime NOT NULL,
@@ -449,6 +454,7 @@ CREATE TABLE [js_sys_menu]
[extend_d2] datetime,
[extend_d3] datetime,
[extend_d4] datetime,
[extend_json] text,
PRIMARY KEY ([menu_code])
);
@@ -637,6 +643,7 @@ CREATE TABLE [js_sys_office]
[extend_d2] datetime,
[extend_d3] datetime,
[extend_d4] datetime,
[extend_json] text,
PRIMARY KEY ([office_code])
);
@@ -645,6 +652,7 @@ CREATE TABLE [js_sys_office]
CREATE TABLE [js_sys_post]
(
[post_code] varchar(64) NOT NULL,
[view_code] varchar(100),
[post_name] varchar(100) NOT NULL,
[post_type] varchar(100),
[post_sort] decimal(10),
@@ -665,6 +673,7 @@ CREATE TABLE [js_sys_role]
(
[role_code] varchar(64) NOT NULL,
[role_name] varchar(100) NOT NULL,
[view_code] varchar(100),
[role_type] varchar(100),
[role_sort] decimal(10),
[is_sys] char(1),
@@ -699,6 +708,7 @@ CREATE TABLE [js_sys_role]
[extend_d2] datetime,
[extend_d3] datetime,
[extend_d4] datetime,
[extend_json] text,
PRIMARY KEY ([role_code])
);
@@ -785,6 +795,7 @@ CREATE TABLE [js_sys_user]
[extend_d2] datetime,
[extend_d3] datetime,
[extend_d4] datetime,
[extend_json] text,
PRIMARY KEY ([user_code])
);

11
modules/core/db/mysql/core.sql
View File

@@ -122,6 +122,7 @@ CREATE TABLE js_sys_company
extend_d2 datetime COMMENT '扩展 Date 2',
extend_d3 datetime COMMENT '扩展 Date 3',
extend_d4 datetime COMMENT '扩展 Date 4',
extend_json text COMMENT '扩展 JSON',
PRIMARY KEY (company_code)
) COMMENT = '公司表';
@@ -199,6 +200,7 @@ CREATE TABLE js_sys_dict_data
extend_d2 datetime COMMENT '扩展 Date 2',
extend_d3 datetime COMMENT '扩展 Date 3',
extend_d4 datetime COMMENT '扩展 Date 4',
extend_json text COMMENT '扩展 JSON',
PRIMARY KEY (dict_code)
) COMMENT = '字典数据表';
@@ -314,6 +316,7 @@ CREATE TABLE js_sys_file_upload
extend_d2 datetime COMMENT '扩展 Date 2',
extend_d3 datetime COMMENT '扩展 Date 3',
extend_d4 datetime COMMENT '扩展 Date 4',
extend_json text COMMENT '扩展 JSON',
PRIMARY KEY (id)
) COMMENT = '文件上传表';
@@ -424,6 +427,8 @@ CREATE TABLE js_sys_menu
is_show char(1) NOT NULL COMMENT '是否显示（1显示 0隐藏）',
sys_code varchar(64) NOT NULL COMMENT '归属系统（default:主导航菜单、mobileApp:APP菜单）',
module_codes varchar(500) NOT NULL COMMENT '归属模块（多个用逗号隔开）',
component varchar(500) COMMENT '组件路径',
params varchar(500) COMMENT '组件参数',
status char(1) DEFAULT '0' NOT NULL COMMENT '状态（0正常 1删除 2停用）',
create_by varchar(64) NOT NULL COMMENT '创建者',
create_date datetime NOT NULL COMMENT '创建时间',
@@ -450,6 +455,7 @@ CREATE TABLE js_sys_menu
extend_d2 datetime COMMENT '扩展 Date 2',
extend_d3 datetime COMMENT '扩展 Date 3',
extend_d4 datetime COMMENT '扩展 Date 4',
extend_json text COMMENT '扩展 JSON',
PRIMARY KEY (menu_code)
) COMMENT = '菜单表';
@@ -638,6 +644,7 @@ CREATE TABLE js_sys_office
extend_d2 datetime COMMENT '扩展 Date 2',
extend_d3 datetime COMMENT '扩展 Date 3',
extend_d4 datetime COMMENT '扩展 Date 4',
extend_json text COMMENT '扩展 JSON',
PRIMARY KEY (office_code)
) COMMENT = '组织机构表';
@@ -646,6 +653,7 @@ CREATE TABLE js_sys_office
CREATE TABLE js_sys_post
(
post_code varchar(64) NOT NULL COMMENT '岗位编码',
view_code varchar(100) COMMENT '岗位代码',
post_name varchar(100) NOT NULL COMMENT '岗位名称',
post_type varchar(100) COMMENT '岗位分类（高管、中层、基层）',
post_sort decimal(10) COMMENT '岗位排序（升序）',
@@ -666,6 +674,7 @@ CREATE TABLE js_sys_role
(
role_code varchar(64) NOT NULL COMMENT '角色编码',
role_name varchar(100) NOT NULL COMMENT '角色名称',
view_code varchar(100) COMMENT '角色代码',
role_type varchar(100) COMMENT '角色分类（高管、中层、基层、其它）',
role_sort decimal(10) COMMENT '角色排序（升序）',
is_sys char(1) COMMENT '系统内置（1是 0否）',
@@ -700,6 +709,7 @@ CREATE TABLE js_sys_role
extend_d2 datetime COMMENT '扩展 Date 2',
extend_d3 datetime COMMENT '扩展 Date 3',
extend_d4 datetime COMMENT '扩展 Date 4',
extend_json text COMMENT '扩展 JSON',
PRIMARY KEY (role_code)
) COMMENT = '角色表';
@@ -786,6 +796,7 @@ CREATE TABLE js_sys_user
extend_d2 datetime COMMENT '扩展 Date 2',
extend_d3 datetime COMMENT '扩展 Date 3',
extend_d4 datetime COMMENT '扩展 Date 4',
extend_json text COMMENT '扩展 JSON',
PRIMARY KEY (user_code)
) COMMENT = '用户表';

22
modules/core/db/oracle/core.sql
View File

@@ -121,6 +121,7 @@ CREATE TABLE js_sys_company
extend_d2 timestamp,
extend_d3 timestamp,
extend_d4 timestamp,
extend_json clob,
PRIMARY KEY (company_code)
);
@@ -198,6 +199,7 @@ CREATE TABLE js_sys_dict_data
extend_d2 timestamp,
extend_d3 timestamp,
extend_d4 timestamp,
extend_json clob,
PRIMARY KEY (dict_code)
);
@@ -313,6 +315,7 @@ CREATE TABLE js_sys_file_upload
extend_d2 timestamp,
extend_d3 timestamp,
extend_d4 timestamp,
extend_json clob,
PRIMARY KEY (id)
);
@@ -423,6 +426,8 @@ CREATE TABLE js_sys_menu
is_show char(1) NOT NULL,
sys_code varchar2(64) NOT NULL,
module_codes varchar2(500) NOT NULL,
component varchar2(500),
params varchar2(500),
status char(1) DEFAULT '0' NOT NULL,
create_by varchar2(64) NOT NULL,
create_date timestamp NOT NULL,
@@ -449,6 +454,7 @@ CREATE TABLE js_sys_menu
extend_d2 timestamp,
extend_d3 timestamp,
extend_d4 timestamp,
extend_json clob,
PRIMARY KEY (menu_code)
);
@@ -637,6 +643,7 @@ CREATE TABLE js_sys_office
extend_d2 timestamp,
extend_d3 timestamp,
extend_d4 timestamp,
extend_json clob,
PRIMARY KEY (office_code)
);
@@ -645,6 +652,7 @@ CREATE TABLE js_sys_office
CREATE TABLE js_sys_post
(
post_code varchar2(64) NOT NULL,
view_code varchar2(100),
post_name varchar2(100) NOT NULL,
post_type varchar2(100),
post_sort number(10),
@@ -665,6 +673,7 @@ CREATE TABLE js_sys_role
(
role_code varchar2(64) NOT NULL,
role_name varchar2(100) NOT NULL,
view_code varchar2(100),
role_type varchar2(100),
role_sort number(10),
is_sys char(1),
@@ -699,6 +708,7 @@ CREATE TABLE js_sys_role
extend_d2 timestamp,
extend_d3 timestamp,
extend_d4 timestamp,
extend_json clob,
PRIMARY KEY (role_code)
);
@@ -785,6 +795,7 @@ CREATE TABLE js_sys_user
extend_d2 timestamp,
extend_d3 timestamp,
extend_d4 timestamp,
extend_json clob,
PRIMARY KEY (user_code)
);
@@ -1040,6 +1051,7 @@ COMMENT ON COLUMN js_sys_company.extend_d1 IS '扩展 Date 1';
COMMENT ON COLUMN js_sys_company.extend_d2 IS '扩展 Date 2';
COMMENT ON COLUMN js_sys_company.extend_d3 IS '扩展 Date 3';
COMMENT ON COLUMN js_sys_company.extend_d4 IS '扩展 Date 4';
COMMENT ON COLUMN js_sys_company.extend_json IS '扩展 JSON';
COMMENT ON TABLE js_sys_company_office IS '公司部门关联表';
COMMENT ON COLUMN js_sys_company_office.company_code IS '公司编码';
COMMENT ON COLUMN js_sys_company_office.office_code IS '机构编码';
@@ -1099,6 +1111,7 @@ COMMENT ON COLUMN js_sys_dict_data.extend_d1 IS '扩展 Date 1';
COMMENT ON COLUMN js_sys_dict_data.extend_d2 IS '扩展 Date 2';
COMMENT ON COLUMN js_sys_dict_data.extend_d3 IS '扩展 Date 3';
COMMENT ON COLUMN js_sys_dict_data.extend_d4 IS '扩展 Date 4';
COMMENT ON COLUMN js_sys_dict_data.extend_json IS '扩展 JSON';
COMMENT ON TABLE js_sys_dict_type IS '字典类型表';
COMMENT ON COLUMN js_sys_dict_type.id IS '编号';
COMMENT ON COLUMN js_sys_dict_type.dict_name IS '字典名称';
@@ -1178,6 +1191,7 @@ COMMENT ON COLUMN js_sys_file_upload.extend_d1 IS '扩展 Date 1';
COMMENT ON COLUMN js_sys_file_upload.extend_d2 IS '扩展 Date 2';
COMMENT ON COLUMN js_sys_file_upload.extend_d3 IS '扩展 Date 3';
COMMENT ON COLUMN js_sys_file_upload.extend_d4 IS '扩展 Date 4';
COMMENT ON COLUMN js_sys_file_upload.extend_json IS '扩展 JSON';
COMMENT ON TABLE js_sys_job IS '作业调度表';
COMMENT ON COLUMN js_sys_job.job_name IS '任务名称';
COMMENT ON COLUMN js_sys_job.job_group IS '任务组名';
@@ -1258,6 +1272,8 @@ COMMENT ON COLUMN js_sys_menu.weight IS '菜单权重';
COMMENT ON COLUMN js_sys_menu.is_show IS '是否显示（1显示 0隐藏）';
COMMENT ON COLUMN js_sys_menu.sys_code IS '归属系统（default:主导航菜单、mobileApp:APP菜单）';
COMMENT ON COLUMN js_sys_menu.module_codes IS '归属模块（多个用逗号隔开）';
COMMENT ON COLUMN js_sys_menu.component IS '组件路径';
COMMENT ON COLUMN js_sys_menu.params IS '组件参数';
COMMENT ON COLUMN js_sys_menu.status IS '状态（0正常 1删除 2停用）';
COMMENT ON COLUMN js_sys_menu.create_by IS '创建者';
COMMENT ON COLUMN js_sys_menu.create_date IS '创建时间';
@@ -1284,6 +1300,7 @@ COMMENT ON COLUMN js_sys_menu.extend_d1 IS '扩展 Date 1';
COMMENT ON COLUMN js_sys_menu.extend_d2 IS '扩展 Date 2';
COMMENT ON COLUMN js_sys_menu.extend_d3 IS '扩展 Date 3';
COMMENT ON COLUMN js_sys_menu.extend_d4 IS '扩展 Date 4';
COMMENT ON COLUMN js_sys_menu.extend_json IS '扩展 JSON';
COMMENT ON TABLE js_sys_module IS '模块表';
COMMENT ON COLUMN js_sys_module.module_code IS '模块编码';
COMMENT ON COLUMN js_sys_module.module_name IS '模块名称';
@@ -1430,8 +1447,10 @@ COMMENT ON COLUMN js_sys_office.extend_d1 IS '扩展 Date 1';
COMMENT ON COLUMN js_sys_office.extend_d2 IS '扩展 Date 2';
COMMENT ON COLUMN js_sys_office.extend_d3 IS '扩展 Date 3';
COMMENT ON COLUMN js_sys_office.extend_d4 IS '扩展 Date 4';
COMMENT ON COLUMN js_sys_office.extend_json IS '扩展 JSON';
COMMENT ON TABLE js_sys_post IS '员工岗位表';
COMMENT ON COLUMN js_sys_post.post_code IS '岗位编码';
COMMENT ON COLUMN js_sys_post.view_code IS '岗位代码';
COMMENT ON COLUMN js_sys_post.post_name IS '岗位名称';
COMMENT ON COLUMN js_sys_post.post_type IS '岗位分类（高管、中层、基层）';
COMMENT ON COLUMN js_sys_post.post_sort IS '岗位排序（升序）';
@@ -1446,6 +1465,7 @@ COMMENT ON COLUMN js_sys_post.corp_name IS '租户名称';
COMMENT ON TABLE js_sys_role IS '角色表';
COMMENT ON COLUMN js_sys_role.role_code IS '角色编码';
COMMENT ON COLUMN js_sys_role.role_name IS '角色名称';
COMMENT ON COLUMN js_sys_role.view_code IS '角色代码';
COMMENT ON COLUMN js_sys_role.role_type IS '角色分类（高管、中层、基层、其它）';
COMMENT ON COLUMN js_sys_role.role_sort IS '角色排序（升序）';
COMMENT ON COLUMN js_sys_role.is_sys IS '系统内置（1是 0否）';
@@ -1480,6 +1500,7 @@ COMMENT ON COLUMN js_sys_role.extend_d1 IS '扩展 Date 1';
COMMENT ON COLUMN js_sys_role.extend_d2 IS '扩展 Date 2';
COMMENT ON COLUMN js_sys_role.extend_d3 IS '扩展 Date 3';
COMMENT ON COLUMN js_sys_role.extend_d4 IS '扩展 Date 4';
COMMENT ON COLUMN js_sys_role.extend_json IS '扩展 JSON';
COMMENT ON TABLE js_sys_role_data_scope IS '角色数据权限表';
COMMENT ON COLUMN js_sys_role_data_scope.role_code IS '控制角色编码';
COMMENT ON COLUMN js_sys_role_data_scope.ctrl_type IS '控制类型';
@@ -1548,6 +1569,7 @@ COMMENT ON COLUMN js_sys_user.extend_d1 IS '扩展 Date 1';
COMMENT ON COLUMN js_sys_user.extend_d2 IS '扩展 Date 2';
COMMENT ON COLUMN js_sys_user.extend_d3 IS '扩展 Date 3';
COMMENT ON COLUMN js_sys_user.extend_d4 IS '扩展 Date 4';
COMMENT ON COLUMN js_sys_user.extend_json IS '扩展 JSON';
COMMENT ON TABLE js_sys_user_data_scope IS '用户数据权限表';
COMMENT ON COLUMN js_sys_user_data_scope.user_code IS '控制用户编码';
COMMENT ON COLUMN js_sys_user_data_scope.ctrl_type IS '控制类型';

22
modules/core/db/postgresql/core.sql
View File

@@ -121,6 +121,7 @@ CREATE TABLE js_sys_company
extend_d2 timestamp,
extend_d3 timestamp,
extend_d4 timestamp,
extend_json text,
PRIMARY KEY (company_code)
) WITHOUT OIDS;
@@ -198,6 +199,7 @@ CREATE TABLE js_sys_dict_data
extend_d2 timestamp,
extend_d3 timestamp,
extend_d4 timestamp,
extend_json text,
PRIMARY KEY (dict_code)
) WITHOUT OIDS;
@@ -313,6 +315,7 @@ CREATE TABLE js_sys_file_upload
extend_d2 timestamp,
extend_d3 timestamp,
extend_d4 timestamp,
extend_json text,
PRIMARY KEY (id)
) WITHOUT OIDS;
@@ -423,6 +426,8 @@ CREATE TABLE js_sys_menu
is_show char(1) NOT NULL,
sys_code varchar(64) NOT NULL,
module_codes varchar(500) NOT NULL,
component varchar(500),
params varchar(500),
status char(1) DEFAULT '0' NOT NULL,
create_by varchar(64) NOT NULL,
create_date timestamp NOT NULL,
@@ -449,6 +454,7 @@ CREATE TABLE js_sys_menu
extend_d2 timestamp,
extend_d3 timestamp,
extend_d4 timestamp,
extend_json text,
PRIMARY KEY (menu_code)
) WITHOUT OIDS;
@@ -637,6 +643,7 @@ CREATE TABLE js_sys_office
extend_d2 timestamp,
extend_d3 timestamp,
extend_d4 timestamp,
extend_json text,
PRIMARY KEY (office_code)
) WITHOUT OIDS;
@@ -645,6 +652,7 @@ CREATE TABLE js_sys_office
CREATE TABLE js_sys_post
(
post_code varchar(64) NOT NULL,
view_code varchar(100),
post_name varchar(100) NOT NULL,
post_type varchar(100),
post_sort decimal(10),
@@ -665,6 +673,7 @@ CREATE TABLE js_sys_role
(
role_code varchar(64) NOT NULL,
role_name varchar(100) NOT NULL,
view_code varchar(100),
role_type varchar(100),
role_sort decimal(10),
is_sys char(1),
@@ -699,6 +708,7 @@ CREATE TABLE js_sys_role
extend_d2 timestamp,
extend_d3 timestamp,
extend_d4 timestamp,
extend_json text,
PRIMARY KEY (role_code)
) WITHOUT OIDS;
@@ -785,6 +795,7 @@ CREATE TABLE js_sys_user
extend_d2 timestamp,
extend_d3 timestamp,
extend_d4 timestamp,
extend_json text,
PRIMARY KEY (user_code)
) WITHOUT OIDS;
@@ -1040,6 +1051,7 @@ COMMENT ON COLUMN js_sys_company.extend_d1 IS '扩展 Date 1';
COMMENT ON COLUMN js_sys_company.extend_d2 IS '扩展 Date 2';
COMMENT ON COLUMN js_sys_company.extend_d3 IS '扩展 Date 3';
COMMENT ON COLUMN js_sys_company.extend_d4 IS '扩展 Date 4';
COMMENT ON COLUMN js_sys_company.extend_json IS '扩展 JSON';
COMMENT ON TABLE js_sys_company_office IS '公司部门关联表';
COMMENT ON COLUMN js_sys_company_office.company_code IS '公司编码';
COMMENT ON COLUMN js_sys_company_office.office_code IS '机构编码';
@@ -1099,6 +1111,7 @@ COMMENT ON COLUMN js_sys_dict_data.extend_d1 IS '扩展 Date 1';
COMMENT ON COLUMN js_sys_dict_data.extend_d2 IS '扩展 Date 2';
COMMENT ON COLUMN js_sys_dict_data.extend_d3 IS '扩展 Date 3';
COMMENT ON COLUMN js_sys_dict_data.extend_d4 IS '扩展 Date 4';
COMMENT ON COLUMN js_sys_dict_data.extend_json IS '扩展 JSON';
COMMENT ON TABLE js_sys_dict_type IS '字典类型表';
COMMENT ON COLUMN js_sys_dict_type.id IS '编号';
COMMENT ON COLUMN js_sys_dict_type.dict_name IS '字典名称';
@@ -1178,6 +1191,7 @@ COMMENT ON COLUMN js_sys_file_upload.extend_d1 IS '扩展 Date 1';
COMMENT ON COLUMN js_sys_file_upload.extend_d2 IS '扩展 Date 2';
COMMENT ON COLUMN js_sys_file_upload.extend_d3 IS '扩展 Date 3';
COMMENT ON COLUMN js_sys_file_upload.extend_d4 IS '扩展 Date 4';
COMMENT ON COLUMN js_sys_file_upload.extend_json IS '扩展 JSON';
COMMENT ON TABLE js_sys_job IS '作业调度表';
COMMENT ON COLUMN js_sys_job.job_name IS '任务名称';
COMMENT ON COLUMN js_sys_job.job_group IS '任务组名';
@@ -1258,6 +1272,8 @@ COMMENT ON COLUMN js_sys_menu.weight IS '菜单权重';
COMMENT ON COLUMN js_sys_menu.is_show IS '是否显示（1显示 0隐藏）';
COMMENT ON COLUMN js_sys_menu.sys_code IS '归属系统（default:主导航菜单、mobileApp:APP菜单）';
COMMENT ON COLUMN js_sys_menu.module_codes IS '归属模块（多个用逗号隔开）';
COMMENT ON COLUMN js_sys_menu.component IS '组件路径';
COMMENT ON COLUMN js_sys_menu.params IS '组件参数';
COMMENT ON COLUMN js_sys_menu.status IS '状态（0正常 1删除 2停用）';
COMMENT ON COLUMN js_sys_menu.create_by IS '创建者';
COMMENT ON COLUMN js_sys_menu.create_date IS '创建时间';
@@ -1284,6 +1300,7 @@ COMMENT ON COLUMN js_sys_menu.extend_d1 IS '扩展 Date 1';
COMMENT ON COLUMN js_sys_menu.extend_d2 IS '扩展 Date 2';
COMMENT ON COLUMN js_sys_menu.extend_d3 IS '扩展 Date 3';
COMMENT ON COLUMN js_sys_menu.extend_d4 IS '扩展 Date 4';
COMMENT ON COLUMN js_sys_menu.extend_json IS '扩展 JSON';
COMMENT ON TABLE js_sys_module IS '模块表';
COMMENT ON COLUMN js_sys_module.module_code IS '模块编码';
COMMENT ON COLUMN js_sys_module.module_name IS '模块名称';
@@ -1430,8 +1447,10 @@ COMMENT ON COLUMN js_sys_office.extend_d1 IS '扩展 Date 1';
COMMENT ON COLUMN js_sys_office.extend_d2 IS '扩展 Date 2';
COMMENT ON COLUMN js_sys_office.extend_d3 IS '扩展 Date 3';
COMMENT ON COLUMN js_sys_office.extend_d4 IS '扩展 Date 4';
COMMENT ON COLUMN js_sys_office.extend_json IS '扩展 JSON';
COMMENT ON TABLE js_sys_post IS '员工岗位表';
COMMENT ON COLUMN js_sys_post.post_code IS '岗位编码';
COMMENT ON COLUMN js_sys_post.view_code IS '岗位代码';
COMMENT ON COLUMN js_sys_post.post_name IS '岗位名称';
COMMENT ON COLUMN js_sys_post.post_type IS '岗位分类（高管、中层、基层）';
COMMENT ON COLUMN js_sys_post.post_sort IS '岗位排序（升序）';
@@ -1446,6 +1465,7 @@ COMMENT ON COLUMN js_sys_post.corp_name IS '租户名称';
COMMENT ON TABLE js_sys_role IS '角色表';
COMMENT ON COLUMN js_sys_role.role_code IS '角色编码';
COMMENT ON COLUMN js_sys_role.role_name IS '角色名称';
COMMENT ON COLUMN js_sys_role.view_code IS '角色代码';
COMMENT ON COLUMN js_sys_role.role_type IS '角色分类（高管、中层、基层、其它）';
COMMENT ON COLUMN js_sys_role.role_sort IS '角色排序（升序）';
COMMENT ON COLUMN js_sys_role.is_sys IS '系统内置（1是 0否）';
@@ -1480,6 +1500,7 @@ COMMENT ON COLUMN js_sys_role.extend_d1 IS '扩展 Date 1';
COMMENT ON COLUMN js_sys_role.extend_d2 IS '扩展 Date 2';
COMMENT ON COLUMN js_sys_role.extend_d3 IS '扩展 Date 3';
COMMENT ON COLUMN js_sys_role.extend_d4 IS '扩展 Date 4';
COMMENT ON COLUMN js_sys_role.extend_json IS '扩展 JSON';
COMMENT ON TABLE js_sys_role_data_scope IS '角色数据权限表';
COMMENT ON COLUMN js_sys_role_data_scope.role_code IS '控制角色编码';
COMMENT ON COLUMN js_sys_role_data_scope.ctrl_type IS '控制类型';
@@ -1548,6 +1569,7 @@ COMMENT ON COLUMN js_sys_user.extend_d1 IS '扩展 Date 1';
COMMENT ON COLUMN js_sys_user.extend_d2 IS '扩展 Date 2';
COMMENT ON COLUMN js_sys_user.extend_d3 IS '扩展 Date 3';
COMMENT ON COLUMN js_sys_user.extend_d4 IS '扩展 Date 4';
COMMENT ON COLUMN js_sys_user.extend_json IS '扩展 JSON';
COMMENT ON TABLE js_sys_user_data_scope IS '用户数据权限表';
COMMENT ON COLUMN js_sys_user_data_scope.user_code IS '控制用户编码';
COMMENT ON COLUMN js_sys_user_data_scope.ctrl_type IS '控制类型';

172
modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.java
View File

@@ -12,11 +12,7 @@ import org.springframework.stereotype.Component;
import com.jeesite.common.callback.MethodCallback;
import com.jeesite.common.config.Global;
import com.jeesite.common.idgen.IdGen;
import com.jeesite.common.lang.StringUtils;
import com.jeesite.common.tests.BaseInitDataTests;
import com.jeesite.modules.gen.entity.GenTable;
import com.jeesite.modules.gen.entity.GenTableColumn;
import com.jeesite.modules.gen.service.GenTableService;
import com.jeesite.modules.gen.utils.GenUtils;
import com.jeesite.modules.job.dao.JobDao;
import com.jeesite.modules.job.entity.JobEntity;
@@ -77,26 +73,9 @@ public class InitCoreData extends BaseInitDataTests {
this.initPost();
this.initEmpUser();
this.initJob();
this.initGenDemoData();
return true;
}
// /**
// * 建表语句执行
// */
// public void createTable() throws Exception{
// runScript("core.sql");
// runScript("job.sql");
// runScript("test.sql");
// }
//
// /**
// * 清理日志表
// */
// public void initLog() throws Exception{
// clearTable(Log.class);
// }
// @Autowired
// private AreaService areaService;
/**
@@ -373,7 +352,11 @@ public class InitCoreData extends BaseInitDataTests {
@Override
public Object execute(Object... params) {
String action = (String)params[0];
if("set".equals(action)){
if("check".equals(action)){
User user = new User();
user.setLoginCode("user1");
return userService.getByLoginCode(user) == null;
}else if("set".equals(action)){
EmpUser entity = (EmpUser)params[1];
String header = (String)params[2];
String val = (String)params[3];
@@ -384,8 +367,7 @@ public class InitCoreData extends BaseInitDataTests {
entity.getEmployee().setEmployeePosts(val);
return true;
}
}
else if("save".equals(action)){
}else if("save".equals(action)){
EmpUser entity = (EmpUser)params[1];
entity.setIsNewRecord(true);
empUserService.save(entity);
@@ -426,148 +408,6 @@ public class InitCoreData extends BaseInitDataTests {
jobDao.insert(job);
}
@Autowired
private GenTableService genTableService;
/**
* 代码生成测试数据
*/
public void initGenDemoData() throws Exception{
if (!checkTable(GenTable.class)) {
return;
}
if (!checkTable(GenTableColumn.class)) {
return;
}
initGenTestData();
initGenTreeData();
}
/**
* 代码生成测试数据
*/
private void initGenTestData() throws Exception{
GenTable genTable = new GenTable();
genTable.setIsNewRecord(true);
genTable.setTableName("test_data");
genTable = genTableService.getFromDb(genTable);
genTable.setIsNewRecord(true);
genTable.setClassName("TestData");
genTable.setFunctionAuthor("ThinkGem");
genTable.setTplCategory("crud");
genTable.setPackageName("com.jeesite.modules");
genTable.setModuleName("test");
genTable.setSubModuleName("");
genTable.setFunctionName("测试数据");
genTable.setFunctionNameSimple("数据");
genTable.getOptionMap().put("isHaveDisableEnable", Global.YES);
genTable.getOptionMap().put("isHaveDelete", Global.YES);
genTable.getOptionMap().put("isFileUpload", Global.YES);
genTable.getOptionMap().put("isImageUpload", Global.YES);
initGenTableColumn(genTable);
genTableService.save(genTable);
// 子表
GenTable genTableChild = new GenTable();
genTableChild.setIsNewRecord(true);
genTableChild.setTableName("test_data_child");
genTableChild = genTableService.getFromDb(genTableChild);
genTableChild.setIsNewRecord(true);
genTableChild.setClassName("TestDataChild");
genTableChild.setFunctionAuthor("ThinkGem");
genTableChild.setTplCategory("crud");
genTableChild.setPackageName("com.jeesite.modules");
genTableChild.setModuleName("test");
genTableChild.setSubModuleName("");
genTableChild.setFunctionName("测试子表");
genTableChild.setFunctionNameSimple("数据");
genTableChild.setParentTableName("test_data");
genTableChild.setParentTableFkName("test_data_id");
initGenTableColumn(genTableChild);
genTableService.save(genTableChild);
}
/**
* 代码生成测试数据（列初始化）
*/
private void initGenTableColumn(GenTable genTable){
for(GenTableColumn column : genTable.getColumnList()){
if ("test_input".equals(column.getColumnName())
|| "test_textarea".equals(column.getColumnName())
|| "test_select".equals(column.getColumnName())
|| "test_select_multiple".equals(column.getColumnName())
|| "test_checkbox".equals(column.getColumnName())
|| "test_radio".equals(column.getColumnName())
|| "test_date".equals(column.getColumnName())
|| "test_datetime".equals(column.getColumnName())
){
column.setShowType(StringUtils.substringAfter(
column.getColumnName(), "test_"));
if ("test_input".equals(column.getColumnName())
){
column.setQueryType("LIKE");
}
else if ("test_textarea".equals(column.getColumnName())
){
column.setQueryType("LIKE");
column.getOptionMap().put("isNewLine", Global.YES);
// column.getOptionMap().put("gridRowCol", "12/2/10");
}
else if ("test_select".equals(column.getColumnName())
|| "test_select_multiple".equals(column.getColumnName())
|| "test_radio".equals(column.getColumnName())
|| "test_checkbox".equals(column.getColumnName())
){
column.getOptionMap().put("dictType", "sys_menu_type");
column.getOptionMap().put("dictName", "sys_menu_type");
}
else if ("test_date".equals(column.getColumnName())
|| "test_datetime".equals(column.getColumnName())
){
column.setQueryType("BETWEEN");
}
}else if ("test_user_code".equals(column.getColumnName())){
column.setAttrType("com.jeesite.modules.sys.entity.User");
column.setFullAttrName("testUser");
column.setShowType("userselect");
}else if ("test_office_code".equals(column.getColumnName())){
column.setAttrType("com.jeesite.modules.sys.entity.Office");
column.setFullAttrName("testOffice");
column.setShowType("officeselect");
}else if ("test_area_code".equals(column.getColumnName())){
column.setFullAttrName("testAreaCode|testAreaName");
column.setShowType("areaselect");
}else if ("test_area_name".equals(column.getColumnName())){
column.setIsEdit(Global.NO);
column.setIsQuery(Global.NO);
}else if ("test_data_id".equals(column.getColumnName())){
column.setFullAttrName("testData");
}
}
}
/**
* 代码生成树表测试数据
*/
private void initGenTreeData() throws Exception{
GenTable genTable = new GenTable();
genTable.setIsNewRecord(true);
genTable.setTableName("test_tree");
genTable = genTableService.getFromDb(genTable);
genTable.setIsNewRecord(true);
genTable.setClassName("TestTree");
genTable.setFunctionAuthor("ThinkGem");
genTable.setTplCategory("treeGrid");
genTable.setPackageName("com.jeesite.modules");
genTable.setModuleName("test");
genTable.setSubModuleName("");
genTable.setFunctionName("测试树表");
genTable.setFunctionNameSimple("数据");
genTable.getOptionMap().put("isHaveDisableEnable", Global.YES);
genTable.getOptionMap().put("isHaveDelete", Global.YES);
genTable.getOptionMap().put("isFileUpload", Global.YES);
genTable.getOptionMap().put("isImageUpload", Global.YES);
genTable.getOptionMap().put("treeViewCode", "tree_code");
genTable.getOptionMap().put("treeViewName", "tree_name");
initGenTableColumn(genTable);
genTableService.save(genTable);
}
@Override
public int getPhase() {
return Integer.MIN_VALUE + 1000; // core 1000, other 2000, upgrade 10000

BIN
modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx
View File

Binary file not shown.

18
modules/core/src/main/java/com/jeesite/modules/sys/service/support/PostServiceSupport.java
View File

@@ -4,13 +4,17 @@
*/
package com.jeesite.modules.sys.service.support;
import org.apache.commons.lang3.StringUtils;
import org.springframework.transaction.annotation.Transactional;
import com.jeesite.common.config.Global;
import com.jeesite.common.entity.Page;
import com.jeesite.common.service.CrudService;
import com.jeesite.modules.sys.dao.PostDao;
import com.jeesite.modules.sys.entity.Post;
import com.jeesite.modules.sys.entity.Role;
import com.jeesite.modules.sys.service.PostService;
import com.jeesite.modules.sys.utils.CorpUtils;
/**
* 岗位管理Service
@@ -59,6 +63,20 @@ public class PostServiceSupport extends CrudService<PostDao, Post>
super.save(post);
}
/**
* 岗位编码生成规则
*/
public void genId(Role entity, String viewCode){
if (StringUtils.isNotBlank(viewCode)){
// 如果是租户模式，并且当前租户不是默认租户的时候，增加租户前缀防止编码重复
if (Global.isUseCorpModel() && !CorpUtils.DEFAULT_CORP_CODE.equals(CorpUtils.getCurrentCorpCode())){
entity.setId(entity.getCorpCode() + "_" + viewCode);
}else{
entity.setId(viewCode);
}
}
}
/**
* 更新岗位状态
*/

4
modules/core/src/test/java/application.yml
View File

@@ -4,8 +4,8 @@ productName: JeeSite Demo
companyName: ThinkGem
# 产品版本、版权年份
productVersion: V4.3
copyrightYear: 2021
productVersion: V5.0
copyrightYear: 2022
# 数据库连接
jdbc:

151
web/src/main/java/com/jeesite/modules/test/db/InitTestData.java
View File

@@ -4,10 +4,16 @@
*/
package com.jeesite.modules.test.db;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.stereotype.Component;
import com.jeesite.common.config.Global;
import com.jeesite.common.lang.StringUtils;
import com.jeesite.common.tests.BaseInitDataTests;
import com.jeesite.modules.gen.entity.GenTable;
import com.jeesite.modules.gen.entity.GenTableColumn;
import com.jeesite.modules.gen.service.GenTableService;
import com.jeesite.modules.gen.utils.GenUtils;
/**
@@ -25,7 +31,152 @@ public class InitTestData extends BaseInitDataTests {
return true; // 如果表已存在，则无需初始化
}
runCreateScript("test.sql");
initGenDemoData();
return true;
}
@Autowired
private GenTableService genTableService;
/**
* 代码生成测试数据
*/
public void initGenDemoData() throws Exception{
if (!checkTable(GenTable.class)) {
return;
}
if (!checkTable(GenTableColumn.class)) {
return;
}
initGenTestData();
initGenTreeData();
}
/**
* 代码生成测试数据
*/
private void initGenTestData() throws Exception{
GenTable genTable = new GenTable();
genTable.setIsNewRecord(true);
genTable.setTableName("test_data");
genTable = genTableService.getFromDb(genTable);
genTable.setIsNewRecord(true);
genTable.setClassName("TestData");
genTable.setFunctionAuthor("ThinkGem");
genTable.setTplCategory("crud");
genTable.setPackageName("com.jeesite.modules");
genTable.setModuleName("test");
genTable.setSubModuleName("");
genTable.setFunctionName("测试数据");
genTable.setFunctionNameSimple("数据");
genTable.getOptionMap().put("isHaveDisableEnable", Global.YES);
genTable.getOptionMap().put("isHaveDelete", Global.YES);
genTable.getOptionMap().put("isFileUpload", Global.YES);
genTable.getOptionMap().put("isImageUpload", Global.YES);
initGenTableColumn(genTable);
genTableService.save(genTable);
// 子表
GenTable genTableChild = new GenTable();
genTableChild.setIsNewRecord(true);
genTableChild.setTableName("test_data_child");
genTableChild = genTableService.getFromDb(genTableChild);
genTableChild.setIsNewRecord(true);
genTableChild.setClassName("TestDataChild");
genTableChild.setFunctionAuthor("ThinkGem");
genTableChild.setTplCategory("crud");
genTableChild.setPackageName("com.jeesite.modules");
genTableChild.setModuleName("test");
genTableChild.setSubModuleName("");
genTableChild.setFunctionName("测试子表");
genTableChild.setFunctionNameSimple("数据");
genTableChild.setParentTableName("test_data");
genTableChild.setParentTableFkName("test_data_id");
initGenTableColumn(genTableChild);
genTableService.save(genTableChild);
}
/**
* 代码生成测试数据（列初始化）
*/
private void initGenTableColumn(GenTable genTable){
for(GenTableColumn column : genTable.getColumnList()){
if ("test_input".equals(column.getColumnName())
|| "test_textarea".equals(column.getColumnName())
|| "test_select".equals(column.getColumnName())
|| "test_select_multiple".equals(column.getColumnName())
|| "test_checkbox".equals(column.getColumnName())
|| "test_radio".equals(column.getColumnName())
|| "test_date".equals(column.getColumnName())
|| "test_datetime".equals(column.getColumnName())
){
column.setShowType(StringUtils.substringAfter(
column.getColumnName(), "test_"));
if ("test_input".equals(column.getColumnName())
){
column.setQueryType("LIKE");
}
else if ("test_textarea".equals(column.getColumnName())
){
column.setQueryType("LIKE");
column.getOptionMap().put("isNewLine", Global.YES);
// column.getOptionMap().put("gridRowCol", "12/2/10");
}
else if ("test_select".equals(column.getColumnName())
|| "test_select_multiple".equals(column.getColumnName())
|| "test_radio".equals(column.getColumnName())
|| "test_checkbox".equals(column.getColumnName())
){
column.getOptionMap().put("dictType", "sys_menu_type");
column.getOptionMap().put("dictName", "sys_menu_type");
}
else if ("test_date".equals(column.getColumnName())
|| "test_datetime".equals(column.getColumnName())
){
column.setQueryType("BETWEEN");
}
}else if ("test_user_code".equals(column.getColumnName())){
column.setAttrType("com.jeesite.modules.sys.entity.User");
column.setFullAttrName("testUser");
column.setShowType("userselect");
}else if ("test_office_code".equals(column.getColumnName())){
column.setAttrType("com.jeesite.modules.sys.entity.Office");
column.setFullAttrName("testOffice");
column.setShowType("officeselect");
}else if ("test_area_code".equals(column.getColumnName())){
column.setFullAttrName("testAreaCode|testAreaName");
column.setShowType("areaselect");
}else if ("test_area_name".equals(column.getColumnName())){
column.setIsEdit(Global.NO);
column.setIsQuery(Global.NO);
}else if ("test_data_id".equals(column.getColumnName())){
column.setFullAttrName("testData");
}
}
}
/**
* 代码生成树表测试数据
*/
private void initGenTreeData() throws Exception{
GenTable genTable = new GenTable();
genTable.setIsNewRecord(true);
genTable.setTableName("test_tree");
genTable = genTableService.getFromDb(genTable);
genTable.setIsNewRecord(true);
genTable.setClassName("TestTree");
genTable.setFunctionAuthor("ThinkGem");
genTable.setTplCategory("treeGrid");
genTable.setPackageName("com.jeesite.modules");
genTable.setModuleName("test");
genTable.setSubModuleName("");
genTable.setFunctionName("测试树表");
genTable.setFunctionNameSimple("数据");
genTable.getOptionMap().put("isHaveDisableEnable", Global.YES);
genTable.getOptionMap().put("isHaveDelete", Global.YES);
genTable.getOptionMap().put("isFileUpload", Global.YES);
genTable.getOptionMap().put("isImageUpload", Global.YES);
genTable.getOptionMap().put("treeViewCode", "tree_code");
genTable.getOptionMap().put("treeViewName", "tree_name");
initGenTableColumn(genTable);
genTableService.save(genTable);
}
}

6
web/src/main/resources/config/application.yml
View File

@@ -8,8 +8,8 @@ productName: JeeSite Demo
companyName: ThinkGem
# 产品版本、版权年份
productVersion: V4.3
copyrightYear: 2021
productVersion: V5.0
copyrightYear: 2022
#是否演示模式
demoMode: false
@@ -49,7 +49,7 @@ jdbc:
# Mysql 数据库配置
type: mysql
driver: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://127.0.0.1:3306/jeesite?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai
url: jdbc:mysql://127.0.0.1:3306/jeesite_v5?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai
username: root
password: 123456
testSql: SELECT 1