diff --git a/doc/部署说明/部署过程描述.md b/doc/部署说明/部署过程描述.md index aeed5cf7..b1b68802 100644 --- a/doc/部署说明/部署过程描述.md +++ b/doc/部署说明/部署过程描述.md @@ -46,33 +46,42 @@ Nginx 是源码编译安装的，安装在 `/usr/local/nginx/`，可执行文件 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 + mysql -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' --default-character-set=utf8mb4 zfjd_ef20_1 < /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 + mysql -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' --default-character-set=utf8mb4 zfjd_ef20_1 < /efcode20/dbv2/upgrade/000.sql + mysql -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' --default-character-set=utf8mb4 zfjd_ef20_1 < /efcode20/dbv2/upgrade/001.sql + mysql -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' --default-character-set=utf8mb4 zfjd_ef20_1 < /efcode20/dbv2/upgrade/002.sql + mysql -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' --default-character-set=utf8mb4 zfjd_ef20_1 < /efcode20/dbv2/upgrade/003.sql + mysql -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' --default-character-set=utf8mb4 zfjd_ef20_1 < /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_1 < /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_1 < /efcode20/dbv2/upgrade/006.sql + mysql -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' --default-character-set=utf8mb4 zfjd_ef20_1 < /efcode20/dbv2/upgrade/007.sql + mysql -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' --default-character-set=utf8mb4 zfjd_ef20_1 < /efcode20/dbv2/upgrade/008.sql + mysql -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' --default-character-set=utf8mb4 zfjd_ef20_1 < /efcode20/dbv2/upgrade/009.sql + mysql -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' --default-character-set=utf8mb4 zfjd_ef20_1 < /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_1 < /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_1 < /efcode20/dbv2/upgrade/012.sql + mysql -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' --default-character-set=utf8mb4 zfjd_ef20_1 < /efcode20/dbv2/upgrade/013.sql + mysql -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' --default-character-set=utf8mb4 zfjd_ef20_1 < /efcode20/dbv2/upgrade/014.sql + mysql -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' --default-character-set=utf8mb4 zfjd_ef20_1 < /efcode20/dbv2/upgrade/015.sql + mysql -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' --default-character-set=utf8mb4 zfjd_ef20_1 < /efcode20/dbv2/upgrade/016.sql + mysql -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' --default-character-set=utf8mb4 zfjd_ef20_1 < /efcode20/dbv2/upgrade/017.sql + mysql -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' --default-character-set=utf8mb4 zfjd_ef20_1 < /efcode20/dbv2/upgrade/018.sql ``` * 备份2期库 + * 备份1期库（排除市监表） + ```bash + mysqldump -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' --default-character-set=utf8mb4 --single-transaction --triggers --events --ignore-table=zfjd_ef20_1.sszt_jbxx110497_new --ignore-table=zfjd_ef20_1.sszt_jbxx110497 zfjd_ef20_1 > /efcode20/dbv2/zfjd_ef20_1_2026_06_16_utf8.sql + ``` + * 单独备份市监表 + ```bash + mysqldump -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' --default-character-set=utf8mb4 --single-transaction --triggers --events zfjd_ef20_1 sszt_jbxx110497_new > /efcode20/dbv2/zfjd_ef20_1_2026_06_16_utf8_sszt_jbxx110497_new.sql + ``` + * 压缩备份文件 + zip -e -P 'xj.sdeqwe.12345' /efcode20/dbv2/zfjd_ef20_1.zip /efcode20/dbv2/zfjd_ef20_1_2026_06_16_utf8.sql * sql客户端 * mysql -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' ### DATAX diff --git a/script/sql/zfjd-refactoring-v1/sj.sql b/script/sql/zfjd-refactoring-v1/sj.sql deleted file mode 100644 index cd0742b9..00000000 --- a/script/sql/zfjd-refactoring-v1/sj.sql +++ /dev/null @@ -1,51 +0,0 @@ -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/zdxt-web-client/zdxt-admin-plus-ui/package.json b/zdxt-web-client/zdxt-admin-plus-ui/package.json index ae744134..4362bd69 100644 --- a/zdxt-web-client/zdxt-admin-plus-ui/package.json +++ b/zdxt-web-client/zdxt-admin-plus-ui/package.json @@ -8,9 +8,10 @@ "type": "module", "scripts": { "dev": "vite serve --mode development", - "dev-zrb": "vite serve --mode development-zrb-cust", + "vite-server-web-supervision-dev-zrb": "vite serve --mode development-zrb-cust", "build:prod": "vite build --mode production --outDir dist/prod", "build:dev": "vite build --mode development --outDir dist/dev", + "build-zdxt-admin-plus-ui:prod": "vite build --mode production --outDir dist/prod", "zdxt-admin-plus-ui-preview": "vite preview --outDir dist/prod", "zdxt-admin-plus-ui-lint:eslint": "eslint", "zdxt-admin-plus-ui-lint:eslint:fix": "eslint --fix", diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/package.json b/zdxt-web-client/zdxt-efcode-enforcement-app/package.json index 0e89f0e9..5ec624a7 100644 --- a/zdxt-web-client/zdxt-efcode-enforcement-app/package.json +++ b/zdxt-web-client/zdxt-efcode-enforcement-app/package.json @@ -4,10 +4,13 @@ "private": true, "type": "module", "scripts": { - "dev": "vite --mode enforcement-dev", - "test": "vite --mode enforcement-test", - "build:dev": "vite build --mode enforcement-dev --outDir dist/enforcement-dev", - "build:test": "vite build --mode enforcement-test --outDir dist/enforcement-test" + "vite": "vite --mode enforcement-dev", + "vite-server-app:enforcement-dev": "vite --mode enforcement-dev", + "vite-server-app:enforcement-test": "vite --mode enforcement-test", + "vite-test": "vite --mode enforcement-test", + "build-app:enforcement-dev": "vite build --mode enforcement-dev --outDir dist/enforcement-dev", + "build-app:enforcement-test": "vite build --mode enforcement-test --outDir dist/enforcement-test", + "build-app:enforcement-prod": "vite build --mode enforcement-prod --outDir dist/enforcement-prod" }, "dependencies": { "axios": "^1.15.0", diff --git a/zdxt-web-client/zdxt-efcode-supervision-app/package.json b/zdxt-web-client/zdxt-efcode-supervision-app/package.json index 0d4851fa..18545715 100644 --- a/zdxt-web-client/zdxt-efcode-supervision-app/package.json +++ b/zdxt-web-client/zdxt-efcode-supervision-app/package.json @@ -5,6 +5,7 @@ "type": "module", "scripts": { "dev": "vite --mode supervision-dev", + "vite-server-app:supervision-dev": "vite --mode supervision-dev", "build-app:supervision-dev": "vite build --mode supervision-dev --outDir dist/supervision-dev", "build-app:supervision-prod": "vite build --mode supervision-prod --outDir dist/supervision-prod" }, diff --git a/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-prod.yml b/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-prod.yml index b2e7fa4f..4ed7e3c0 100644 --- a/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-prod.yml +++ b/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-prod.yml @@ -47,7 +47,7 @@ spring: driverClassName: com.mysql.cj.jdbc.Driver # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562 # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题) - url: jdbc:mysql://10.76.108.1:15144/zfjd_ef20?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:mysql://10.76.108.1:15144/zfjd_ef20_1?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: zfjd password: szsf@zfjd # # 从库数据源