diff --git a/doc/部署说明/部署过程描述.md b/doc/部署说明/部署过程描述.md index e23da601..aeed5cf7 100644 --- a/doc/部署说明/部署过程描述.md +++ b/doc/部署说明/部署过程描述.md @@ -42,8 +42,39 @@ Nginx 是源码编译安装的，安装在 `/usr/local/nginx/`，可执行文件 mysqldump -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' --default-character-set=utf8mb4 --single-transaction --triggers --events zfjd sszt_jbxx110497 > /efcode20/dbv1/sszt_jbxx110497.sql mysqldump -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' --default-character-set=utf8mb4 --single-transaction --triggers --events zfjd sszt_jbxx110497_new > /efcode20/dbv1/sszt_jbxx110497_new.sql ``` + * 压缩备份文件 + zip -e -P 'xj.sdeqwe.12345' /efcode20/dbv1/zfjdfile1.zip /efcode20/dbv1/zfjd_2026_06_15_ex_sszt_jbxx_utf8.sql + * 导入1期库（排除市监表） + ``` + mysql -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' --default-character-set=utf8mb4 zfjd_ef20 < /efcode20/dbv1/zfjd_2026_06_15_ex_sszt_jbxx_utf8.sql + ``` + * 导入1期库（市监表） + * 升级到二期库 + ``` + mysql -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' --default-character-set=utf8mb4 zfjd_ef20 < /efcode20/dbv2/upgrade/000.sql + mysql -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' --default-character-set=utf8mb4 zfjd_ef20 < /efcode20/dbv2/upgrade/001.sql + mysql -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' --default-character-set=utf8mb4 zfjd_ef20 < /efcode20/dbv2/upgrade/002.sql + mysql -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' --default-character-set=utf8mb4 zfjd_ef20 < /efcode20/dbv2/upgrade/003.sql + mysql -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' --default-character-set=utf8mb4 zfjd_ef20 < /efcode20/dbv2/upgrade/005-1.sql + mysql -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' --default-character-set=utf8mb4 zfjd_ef20 < /efcode20/dbv2/upgrade/005-2.sql + mysql -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' --default-character-set=utf8mb4 zfjd_ef20 < /efcode20/dbv2/upgrade/006.sql + mysql -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' --default-character-set=utf8mb4 zfjd_ef20 < /efcode20/dbv2/upgrade/007.sql + mysql -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' --default-character-set=utf8mb4 zfjd_ef20 < /efcode20/dbv2/upgrade/008.sql + mysql -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' --default-character-set=utf8mb4 zfjd_ef20 < /efcode20/dbv2/upgrade/009.sql + mysql -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' --default-character-set=utf8mb4 zfjd_ef20 < /efcode20/dbv2/upgrade/011-1.sql + mysql -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' --default-character-set=utf8mb4 zfjd_ef20 < /efcode20/dbv2/upgrade/011-2.sql + mysql -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' --default-character-set=utf8mb4 zfjd_ef20 < /efcode20/dbv2/upgrade/012.sql + mysql -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' --default-character-set=utf8mb4 zfjd_ef20 < /efcode20/dbv2/upgrade/013.sql + mysql -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' --default-character-set=utf8mb4 zfjd_ef20 < /efcode20/dbv2/upgrade/014.sql + mysql -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' --default-character-set=utf8mb4 zfjd_ef20 < /efcode20/dbv2/upgrade/015.sql + mysql -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' --default-character-set=utf8mb4 zfjd_ef20 < /efcode20/dbv2/upgrade/016.sql + mysql -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' --default-character-set=utf8mb4 zfjd_ef20 < /efcode20/dbv2/upgrade/017.sql + mysql -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' --default-character-set=utf8mb4 zfjd_ef20 < /efcode20/dbv2/upgrade/018.sql + mysql -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' --default-character-set=utf8mb4 zfjd_ef20 < /efcode20/dbv2/upgrade/019.sql + ``` * 备份2期库 - +* sql客户端 + * mysql -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' ### DATAX --- @@ -124,6 +155,8 @@ Nginx 是源码编译安装的，安装在 `/usr/local/nginx/`，可执行文件 --- ## 10.76.108.11 服务网关 +安装jdk17 +开放防火墙端口 --- @@ -158,7 +191,17 @@ Nginx 是源码编译安装的，安装在 `/usr/local/nginx/`，可执行文件 ```bash systemctl restart redis ``` - + * 查看状态 + ``` + systemctl status redis + ``` + firewall-cmd --state + 或查看完整规则： + firewall-cmd --list-all + 放行 Redis 端口： + firewall-cmd --add-port=6379/tcp --permanent + firewall-cmd --reload + firewall-cmd --list-all --- ## 10.76.108.13 @@ -182,7 +225,17 @@ firewall-cmd --add-port=80/tcp --permanent firewall-cmd --add-port=443/tcp --permanent firewall-cmd --reload ``` +查看ng状态 +systemctl status nginx 防火墙设置 +firewall-cmd --state +firewall-cmd --list-all +firewall-cmd --add-port={80,85,445,81,12001,12002,12003,12004,12005}/tcp --permanent +firewall-cmd --reload +firewall-cmd --list-all + +ng配置文件路径 +/etc/nginx/nginx.conf --- diff --git a/script/sql/zfjd-refactoring-v1/003-删除暂时没有作用的表.sql b/script/sql/zfjd-refactoring-v1/003-删除暂时没有作用的表.sql index 1334c8c9..17ed1a2c 100644 --- a/script/sql/zfjd-refactoring-v1/003-删除暂时没有作用的表.sql +++ b/script/sql/zfjd-refactoring-v1/003-删除暂时没有作用的表.sql @@ -14,29 +14,13 @@ drop table twkf_model_order; drop table twkf_movelog; drop table twkf_moveset; drop table twkf_return_info; -# question相关 -drop table question_answer; -drop table question_bank; -drop table question_fre; -drop table question_library; -# scene相关 -drop table scene_home; -drop table scene_manage; -drop table scene_medal; -drop table scene_message; -drop table scene_question; -drop table scene_role; -drop table scene_tab; -drop table scene_text; # sys相关 drop table sys_address; drop table sys_application; drop table sys_auto_code; drop table sys_auto_code_list; drop table sys_autoencoder; -drop table sys_dept1; drop table sys_map; -drop table sys_menu_bak; drop table sys_model_conf; drop table sys_model_user; drop table sys_role_dict; @@ -44,46 +28,21 @@ drop table sys_tenant_application; drop table sys_type; drop table sys_type_dept; drop table sys_type_menu; -drop table sys_user_assist; -drop table sys_user_bak; drop table sys_user_online; drop table sys_user_type; drop table sys_video_info; # 其他一些表 -drop table user_address; -drop table user_feedback; -drop table wechat_user; -drop table agency; -drop table answer_bank; -drop table app_upload; -drop table area; -drop table area_tree_path; -drop table assessment_criteria; -drop table atta_library; -drop table banner_manage; -drop table bas_business_dict; -drop table bas_district; -drop table bas_video_way_user; drop table duty_dict; drop table duty_dict_item; drop table message_action; drop table message_info; drop table message_record; drop table public_file; -drop table sszt_jbxx110497_new_copy1; drop table t_sinosun_dual; drop table tapp_category_item; -drop table knowledge_library; drop table excel_module_t; drop table excel_upload_t; -drop table equipment_gather; drop table zdxt_rule_t; drop table custom_image; drop table online_record; -drop table pcstest; -drop table key_enterprise; -drop table key_enterprise_category; drop table enforcement_registration_bak; -drop table enterprise_information_copy2; -drop table enterprise_law_enforcement_bak; -drop table non_enforcement_registration_source; diff --git a/script/sql/zfjd-refactoring-v1/009-修改执法码相关的表.sql b/script/sql/zfjd-refactoring-v1/009-修改执法码相关的表.sql index 54374dd4..3788c77e 100644 --- a/script/sql/zfjd-refactoring-v1/009-修改执法码相关的表.sql +++ b/script/sql/zfjd-refactoring-v1/009-修改执法码相关的表.sql @@ -140,11 +140,25 @@ ALTER TABLE enterprise_law_enforcement ADD COLUMN update_by varchar(50) NULL COMMENT '更新者', ADD COLUMN update_time datetime NULL COMMENT '更新时间'; -ALTER TABLE law_enforcement_enterprise - ADD COLUMN create_dept varchar(100) NULL COMMENT '创建部门', - ADD COLUMN create_by varchar(50) NULL COMMENT '创建者', - ADD COLUMN update_by varchar(50) NULL COMMENT '更新者', - ADD COLUMN update_time datetime NULL COMMENT '更新时间'; +create table law_enforcement_enterprise +( + id varchar(32) not null comment '主键' + primary key, + enterprise_name varchar(100) null comment '企业名称', + enterprise_number varchar(100) null comment '企业纳税识别号', + law_enforcement varchar(100) null comment '执法部门', + law_enforcement_id varchar(50) null comment '执法部门ID', + dept_id varchar(50) null comment '部门ID', + user_id varchar(50) null comment '用户ID', + status int(1) null comment '是否已完成 0 否 1 是', + create_time datetime null comment '创建时间', + rel_id varchar(32) null comment '关联检查计划ID', + create_dept varchar(100) null comment '创建部门', + create_by varchar(50) null comment '创建者', + update_by varchar(50) null comment '更新者', + update_time datetime null comment '更新时间' +) + comment '行政检查计划-执法企业'; ALTER TABLE law_enforcement_warning_list ADD COLUMN create_dept varchar(100) NULL COMMENT '创建部门', @@ -152,12 +166,6 @@ ALTER TABLE law_enforcement_warning_list ADD COLUMN update_by varchar(50) NULL COMMENT '更新者', ADD COLUMN update_time datetime NULL COMMENT '更新时间'; -ALTER TABLE law_plan_audit - ADD COLUMN create_dept varchar(100) NULL COMMENT '创建部门', - ADD COLUMN create_by varchar(50) NULL COMMENT '创建者', - ADD COLUMN update_by varchar(50) NULL COMMENT '更新者', - ADD COLUMN update_time datetime NULL COMMENT '更新时间'; - ALTER TABLE linkage_dict ADD COLUMN create_dept varchar(100) NULL COMMENT '创建部门', ADD COLUMN create_by varchar(50) NULL COMMENT '创建者', diff --git a/script/sql/zfjd-refactoring-v1/015-索引优化.sql b/script/sql/zfjd-refactoring-v1/015-索引优化.sql index 703930b5..d2a70e42 100644 --- a/script/sql/zfjd-refactoring-v1/015-索引优化.sql +++ b/script/sql/zfjd-refactoring-v1/015-索引优化.sql @@ -1 +1,40 @@ +create table if not exists sszt_jbxx110497_new +( + JYFW varchar(2000) null comment '经营范围', + ZCZB decimal(19, 6) null comment '注册资本', + FWBM varchar(50) null comment '房屋编码', + YYZT varchar(50) null comment '企业状态', + SSZTLX varchar(4) null comment '商事主体类型', + NDBGXX varchar(4000) null comment '年度报告信息', + BYZD1 varchar(2000) null comment '备用字段1', + BZ varchar(2000) null comment '备注', + ZCH varchar(200) null comment '注册号', + CLRQ varchar(50) null comment '成立日期', + NJQK varchar(500) null comment '年检情况', + JYCS varchar(160) null comment '经营场所', + ZZJGDM varchar(9) null comment '组织机构代码', + BIZHONG varchar(3) null comment '币种', + HYDM varchar(5) null comment '行业代码', + BYZD3 varchar(2000) null comment '备用字段3', + BYZD2 varchar(2000) null comment '备用字段2', + HZRQ varchar(50) null comment '核准/备案日期 ', + JYQXQ varchar(50) null comment '经营期限起', + JYQXZ varchar(50) null comment '经营期限止', + TYSHXYDM varchar(18) null comment '统一社会信用代码', + SBSSZB decimal(19, 6) null comment '申报实收资本', + SWZH varchar(50) null comment '身份证号', + FDDBR varchar(50) null comment '法定代表人/负责人', + LSQYZCH varchar(200) null comment '隶属企业注册号', + LSQYMC varchar(200) null comment '隶属企业名称', + HYML varchar(1) null comment '行业门类', + QYMC varchar(200) null comment '企业名称', + RECORDID varchar(128) not null, + DJJGDH varchar(4) null comment '登记机构代号', + PRIPID varchar(50) null comment '主体身份代码', + INS int not null comment '系统内部INS', + SEQ int not null comment '系统内部SEQ', + UPDATESTATUS int not null, + UPDATETIME varchar(50) not null +); + CREATE INDEX idx_qymc_tyshxydm ON sszt_jbxx110497_new(QYMC, TYSHXYDM); diff --git a/script/sql/zfjd-refactoring-v1/sj.sql b/script/sql/zfjd-refactoring-v1/sj.sql new file mode 100644 index 00000000..cd0742b9 --- /dev/null +++ b/script/sql/zfjd-refactoring-v1/sj.sql @@ -0,0 +1,51 @@ +create table sszt_jbxx110497_new +( + JYFW varchar(2000) null comment '经营范围', + ZCZB decimal(19, 6) null comment '注册资本', + FWBM varchar(50) null comment '房屋编码', + YYZT varchar(50) null comment '企业状态', + SSZTLX varchar(4) null comment '商事主体类型', + NDBGXX varchar(4000) null comment '年度报告信息', + BYZD1 varchar(2000) null comment '备用字段1', + BZ varchar(2000) null comment '备注', + ZCH varchar(200) null comment '注册号', + CLRQ varchar(50) null comment '成立日期', + NJQK varchar(500) null comment '年检情况', + JYCS varchar(160) null comment '经营场所', + ZZJGDM varchar(9) null comment '组织机构代码', + BIZHONG varchar(3) null comment '币种', + HYDM varchar(5) null comment '行业代码', + BYZD3 varchar(2000) null comment '备用字段3', + BYZD2 varchar(2000) null comment '备用字段2', + HZRQ varchar(50) null comment '核准/备案日期 ', + JYQXQ varchar(50) null comment '经营期限起', + JYQXZ varchar(50) null comment '经营期限止', + TYSHXYDM varchar(18) null comment '统一社会信用代码', + SBSSZB decimal(19, 6) null comment '申报实收资本', + SWZH varchar(50) null comment '身份证号', + FDDBR varchar(50) null comment '法定代表人/负责人', + LSQYZCH varchar(200) null comment '隶属企业注册号', + LSQYMC varchar(200) null comment '隶属企业名称', + HYML varchar(1) null comment '行业门类', + QYMC varchar(200) null comment '企业名称', + RECORDID varchar(128) not null, + DJJGDH varchar(4) null comment '登记机构代号', + PRIPID varchar(50) null comment '主体身份代码', + INS int not null comment '系统内部INS', + SEQ int not null comment '系统内部SEQ', + UPDATESTATUS int not null, + UPDATETIME varchar(50) not null +) + row_format = DYNAMIC; + +create index IDX20240816164011757INS + on sszt_jbxx110497_new (INS); + +create index IDX20240816164011757SEQ + on sszt_jbxx110497_new (SEQ); + +create index INDEX_TYSHXYDM_20241111 + on sszt_jbxx110497_new (TYSHXYDM); + +create index idx_qymc_tyshxydm + on sszt_jbxx110497_new (QYMC, TYSHXYDM); diff --git a/script/sql/zfjd-refactoring-v1/其他/gh.sql b/script/sql/zfjd-refactoring-v1/其他/gh.sql index 0a34271a..dc6f0bb3 100644 --- a/script/sql/zfjd-refactoring-v1/其他/gh.sql +++ b/script/sql/zfjd-refactoring-v1/其他/gh.sql @@ -10,7 +10,7 @@ ALTER TABLE `enforcement_registration` -- 初始化登录信息 INSERT INTO `sys_client` ( `id`, `client_id`, `client_key`, `client_secret`, `grant_type`, `device_type`, `active_timeout`, `timeout`, `status`, `del_flag`, `create_dept`, `create_by`, `create_time`, `update_by`, `update_time` ) VALUES -( 3, '9e6eb24cd4e169a98b0d2cd8034d877b', 'enterprise_app', 'enterprise_app_123', 'password,social', 'android', 1800, 604800, '0', '0', '103', 1, NOW() 1, NOW() ); +( 3, '9e6eb24cd4e169a98b0d2cd8034d877b', 'enterprise_app', 'enterprise_app_123', 'password,social', 'android', 1800, 604800, '0', '0', '103', 1, NOW(),1, NOW() ); INSERT INTO `sys_client` ( `id`, `client_id`, `client_key`, `client_secret`, `grant_type`, `device_type`, `active_timeout`, `timeout`, `status`, `del_flag`, `create_dept`, `create_by`, `create_time`, `update_by`, `update_time` ) VALUES diff --git a/script/sql/zfjd-refactoring-v1/其他/大屏/大屏数据库初始化-0613.sql b/script/sql/zfjd-refactoring-v1/其他/大屏/大屏数据库初始化-0613.sql index 953f4189..a024642d 100644 --- a/script/sql/zfjd-refactoring-v1/其他/大屏/大屏数据库初始化-0613.sql +++ b/script/sql/zfjd-refactoring-v1/其他/大屏/大屏数据库初始化-0613.sql @@ -125,18 +125,19 @@ CREATE TABLE `dashboard_company_high_freq_check` ( UNIQUE KEY `uk_year_month_qyid_lyid` (`year`,`month`,`qyid`,`lyid`) COMMENT '按月+企业+领域唯一' ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='大屏-企业高频检查明细表'; -CREATE TABLE `dashboard_domain_dept` ( - `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键ID', - `domain_id` varchar(50) NOT NULL COMMENT '领域ID', - `domain_name` varchar(50) NOT NULL COMMENT '领域名称', - `dept_id` varchar(50) NOT NULL COMMENT '部门ID（对应sys_dept主键）', - `dept_name` varchar(100) NOT NULL COMMENT '部门名称', - `sort` int(11) DEFAULT '0' COMMENT '部门名称', - `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `level` tinyint(4) DEFAULT NULL COMMENT '级别：2-市直，4-区直', - PRIMARY KEY (`id`), - UNIQUE KEY `uk_domain_dept` (`domain_id`,`dept_id`) COMMENT '领域+部门唯一' -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='大屏领域-部门对照关系表'; +/*1期的生产环境中已经存在*/ +-- CREATE TABLE `dashboard_domain_dept` ( +-- `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键ID', +-- `domain_id` varchar(50) NOT NULL COMMENT '领域ID', +-- `domain_name` varchar(50) NOT NULL COMMENT '领域名称', +-- `dept_id` varchar(50) NOT NULL COMMENT '部门ID（对应sys_dept主键）', +-- `dept_name` varchar(100) NOT NULL COMMENT '部门名称', +-- `sort` int(11) DEFAULT '0' COMMENT '部门名称', +-- `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', +-- `level` tinyint(4) DEFAULT NULL COMMENT '级别：2-市直，4-区直', +-- PRIMARY KEY (`id`), +-- UNIQUE KEY `uk_domain_dept` (`domain_id`,`dept_id`) COMMENT '领域+部门唯一' +-- ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='大屏领域-部门对照关系表'; CREATE TABLE `dashboard_enterprise_check` ( `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键ID',