zhuibobo
/
EnforcementCode-2.0
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

合并非现场

dev-v1.0.2
庄锐波 3 months ago
parent
81a67f430a
commit
d0de372e76
4 changed files with 119 additions and 21 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 18
      doc/部署说明/部署过程描述.md
  2. 7
      script/sql/zfjd-refactoring-v1/098-插入临时测试数据.sql
  3. 106
      script/sql/zfjd-refactoring-v1/1005-删除表.sql
  4. 9
      zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/loginByPassword.vue

18
doc/部署说明/部署过程描述.md
View File

@ -38,12 +38,12 @@ Nginx 是源码编译安装的，安装在 `/usr/local/nginx/`，可执行文件
* 备份数据库
* 备份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.sszt_jbxx110497_new --ignore-table=zfjd.sszt_jbxx110497 zfjd > /efcode20/dbv1/zfjd_2026_06_15_ex_sszt_jbxx_utf8.sql
mysqldump -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' --default-character-set=utf8mb4 --single-transaction --triggers --events --ignore-table=zfjd.sszt_jbxx110497_new --ignore-table=zfjd.sszt_jbxx110497 zfjd > /efcode20/dbv1/zfjd_2026_06_20_ex_sszt_jbxx_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 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
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_20.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_20.sql
```
* 压缩备份文件
zip -e -P 'xj.sdeqwe.12345' /efcode20/dbv1/zfjdfile1.zip /efcode20/dbv1/zfjd_2026_06_15_ex_sszt_jbxx_utf8.sql
@ -72,20 +72,24 @@ Nginx 是源码编译安装的，安装在 `/usr/local/nginx/`，可执行文件
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
mysql -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' --default-character-set=utf8mb4 zfjd_ef20_1 < /efcode20/dbv2/upgrade/097.sql
mysql -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' --default-character-set=utf8mb4 zfjd_ef20_1 < /efcode20/dbv2/upgrade/gh.sql
mysql -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' --default-character-set=utf8mb4 zfjd_ef20_1 < /efcode20/dbv2/upgrade/0613.sql
mysql -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' --default-character-set=utf8mb4 zfjd_ef20_1 < /efcode20/dbv2/upgrade/098.sql
mysql -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' --default-character-set=utf8mb4 zfjd_ef20_1 < /efcode20/dbv2/upgrade/099.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
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_20_utf8.sql
mysqldump -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' --default-character-set=utf8mb4 --single-transaction --triggers --events zfjd_ef20_1 > /efcode20/dbv2/zfjd_ef20_1_2026_06_20_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
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_20_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
zip -e -P 'xj.sdeqwe.12345' /efcode20/dbv2/zfjd_ef20_1.zip /efcode20/dbv2/zfjd_ef20_1_2026_06_20_utf8.sql
* sql客户端
* mysql -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd'
### DATAX

7
script/sql/zfjd-refactoring-v1/098-插入临时测试数据.sql
View File

@ -198,13 +198,6 @@ INSERT INTO nos_law_enforcement_task_msg (id, task_id, task_type, title, enterpr
INSERT INTO nos_law_enforcement_task_msg (id, task_id, task_type, title, enterprise_id, enterprise_name, law_enforcement_agency_id, law_enforcement_agency, deadline, create_by, create_time, update_by, update_time, is_delete, create_dept, bureau_dept_id, dept_id, organ_id) VALUES ('2066402883933024257', '2066402882116890625', 1, '行政检查通知', 'cf17a1d4a01443f789f610eafe863069', '新粤云（深圳）信息技术有限公司', '20210922212314631-560B-224D6D31F', '深圳市罗湖区司法局', '2026-07-16 23:59:59', '17608417398', '2026-06-15 14:10:14', '17608417398', '2026-06-15 14:10:14', '0', '20210922222944161-4D52-472FD2194', null, null, null);
INSERT INTO nos_law_enforcement_task_msg (id, task_id, task_type, title, enterprise_id, enterprise_name, law_enforcement_agency_id, law_enforcement_agency, deadline, create_by, create_time, update_by, update_time, is_delete, create_dept, bureau_dept_id, dept_id, organ_id) VALUES ('2066435425822289922', '2066435421732843522', 1, '行政检查通知', 'cf17a1d4a01443f789f610eafe863069', '新粤云（深圳）信息技术有限公司', '20210922212314631-560B-224D6D31F', '深圳市罗湖区司法局', '2026-07-16 23:59:59', '17608417398', '2026-06-15 16:19:33', '17608417398', '2026-06-15 16:19:33', '0', '20210922222944161-4D52-472FD2194', null, null, null);
INSERT INTO nos_law_enforcement_task_msg (id, task_id, task_type, title, enterprise_id, enterprise_name, law_enforcement_agency_id, law_enforcement_agency, deadline, create_by, create_time, update_by, update_time, is_delete, create_dept, bureau_dept_id, dept_id, organ_id) VALUES ('2066459761622888449', '2066459759727063041', 1, '行政检查通知', '915aa8c4731e448694b1fdb6d6406fb1', '测试10.31', '20210922212314631-560B-224D6D31F', '深圳市罗湖区司法局', '2026-07-16 23:59:59', '17608417398', '2026-06-15 17:56:15', '17608417398', '2026-06-15 17:56:15', '0', '20210922222944161-4D52-472FD2194', null, null, null);
INSERT INTO nos_law_enforcement_task_source (id, source_name, create_by, create_time, update_by, update_time, is_delete, create_dept, bureau_dept_id, dept_id, organ_id) VALUES ('1', '日常检查', null, '2026-05-22 11:14:09', null, '2026-05-22 11:14:09', '0', null, null, null, null);
INSERT INTO nos_law_enforcement_task_source (id, source_name, create_by, create_time, update_by, update_time, is_delete, create_dept, bureau_dept_id, dept_id, organ_id) VALUES ('2', '投诉举报', null, '2026-05-22 11:14:09', null, '2026-05-22 11:14:09', '0', null, null, null, null);
INSERT INTO nos_law_enforcement_task_source (id, source_name, create_by, create_time, update_by, update_time, is_delete, create_dept, bureau_dept_id, dept_id, organ_id) VALUES ('3', '上级交办', null, '2026-05-22 11:14:09', null, '2026-05-22 11:14:09', '0', null, null, null, null);
INSERT INTO nos_law_enforcement_task_source (id, source_name, create_by, create_time, update_by, update_time, is_delete, create_dept, bureau_dept_id, dept_id, organ_id) VALUES ('4', '部门移送', null, '2026-05-22 11:14:09', null, '2026-05-22 11:14:09', '0', null, null, null, null);
INSERT INTO nos_law_enforcement_task_source (id, source_name, create_by, create_time, update_by, update_time, is_delete, create_dept, bureau_dept_id, dept_id, organ_id) VALUES ('5', '重点领域治理部署', null, '2026-05-22 11:14:09', null, '2026-05-22 11:14:09', '0', null, null, null, null);
INSERT INTO nos_law_enforcement_task_source (id, source_name, create_by, create_time, update_by, update_time, is_delete, create_dept, bureau_dept_id, dept_id, organ_id) VALUES ('6', '专项行动', null, '2026-05-22 11:14:09', null, '2026-05-22 11:14:09', '0', null, null, null, null);
INSERT INTO nos_law_enforcement_task_source (id, source_name, create_by, create_time, update_by, update_time, is_delete, create_dept, bureau_dept_id, dept_id, organ_id) VALUES ('7', '其它', null, '2026-05-22 11:14:09', null, '2026-05-22 11:14:09', '0', null, null, null, null);
INSERT INTO enforcement_education_services (id, title, publish_dept_ids, publish_dept_names, target_platform, content_type, source_type, content, forward_url, status, view_count, bureau_dept_id, dept_id, organ_id, create_by, create_by_name, create_time, update_by, update_by_name, update_time, is_delete, remark, create_dept) VALUES ('2059109964049473538', '普法宣传与AI一起发展', '1,2,3', '司法局,文旅局，监管局', 1, 0, 2, '司法服务', 'www.baidu.com', 1, 0, null, null, null, -1, null, '2026-05-26 11:10:46', -1, null, '2026-05-26 11:32:34', 0, null, null);
INSERT INTO enforcement_education_services (id, title, publish_dept_ids, publish_dept_names, target_platform, content_type, source_type, content, forward_url, status, view_count, bureau_dept_id, dept_id, organ_id, create_by, create_by_name, create_time, update_by, update_by_name, update_time, is_delete, remark, create_dept) VALUES ('2059110011931648001', '普法宣传1', '1,2,3', '司法局,文旅局，监管局', 1, 0, 1, '司法服务', null, 1, 0, null, null, null, -1, null, '2026-05-26 11:10:58', -1, null, '2026-05-26 11:10:58', 0, null, null);

106
script/sql/zfjd-refactoring-v1/1005-删除表.sql
View File

@ -0,0 +1,106 @@
SET FOREIGN_KEY_CHECKS = 0;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`complaint_item`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`complaint_statistics`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`dashboard_area_info`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`dashboard_check_register_area`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`dashboard_check_register_domain`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`dashboard_company_high_freq_check`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`dashboard_domain_dept`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`dashboard_enterprise_check`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`dashboard_enterprise_monitor`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`dashboard_overview`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`dashboard_situation_trend_area`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`dashboard_situation_trend_domain`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`dashboard_trend_stat`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`dashboard_trend_stat_area`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`efcode_cp_log`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`efcode_cp_notice`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`efcode_cp_notice_message`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`efcode_cp_notice_users`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`efcode_cp_plan`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`efcode_cp_plan_users`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`efcode_cp_reserve`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`efcode_cp_setting`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`efcode_cp_task`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`efcode_virtual_unit`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`enforcement_carousel_banner`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`enforcement_education_services`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`enforcement_inspection_program`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`enforcement_registration`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`enterprise_complaint`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`enterprise_evaluate`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`enterprise_information`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`enterprise_law_enforcement`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`enterprise_merchant_authorization`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`enterprise_pub_qrcode`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`enterprise_user`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`enterprise_user_ref`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`gen_table`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`gen_table_column`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`law_enforcement_enterprise`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`law_enforcement_warning_list`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`linkage_dict`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`non_enforcement_registration`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`non_enforcement_registration_bak`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`qr_code_generate_history`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`qrtz_blob_triggers`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`qrtz_calendars`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`qrtz_cron_triggers`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`qrtz_fired_triggers`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`qrtz_job_details`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`qrtz_locks`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`qrtz_paused_trigger_grps`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`qrtz_scheduler_state`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`qrtz_simple_triggers`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`qrtz_simprop_triggers`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`qrtz_triggers`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`rule_item_list`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`rule_list`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`srz_dept`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`srz_user`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`sszt_jbxx110497_new`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`sys_client`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`sys_config`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`sys_dept`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`sys_dict_data`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`sys_dict_type`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`sys_job`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`sys_job_log`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`sys_logininfor`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`sys_menu`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`sys_message_view_log`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`sys_notice`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`sys_notice_info`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`sys_oper_log`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`sys_oss`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`sys_oss_config`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`sys_post`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`sys_role`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`sys_role_dept`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`sys_role_menu`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`sys_social`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`sys_tenant`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`sys_tenant_package`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`sys_user`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`sys_user_post`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`sys_user_role`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`test_demo`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`test_tree`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`todo_item`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`xzcfajdsrxx594019`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`xzcfajjbxx026705`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`xzcfajjdxx778518`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`xzjcdsrxx016987`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`xzjcjbxx025711`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`xzqzcsxx274939`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`xzqzdsrxx997874`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`xzqzjbxx173774`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`zdxt_file`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`zfjgjdm119368`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`zfryjdm2405301`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`zfztjdm111915`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`zqjdm114333`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`zqyjjdm137344`;
DROP TABLE IF EXISTS `zfjd_ef20_1`.`zqztjdm110149`;
SET FOREIGN_KEY_CHECKS = 1;

9
zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/loginByPassword.vue
View File

@ -36,18 +36,16 @@
</div>
</van-action-sheet>
<van-popup v-model:show="showNavigatePicker" :close-on-click-overlay="false" round style="width: 80%; padding: 0.4rem;">
<div class="navigate-title">请选择进入系统</div>
<div style="font-size: 0.5rem; font-weight: bold;" class="navigate-title">请选择进入系统</div>
<div class="navigate-list">
<van-cell
is-link
@click="navigateTo('enforcement')"
style="margin-bottom: 30px"
>
<template #title>
<span style="font-size: 0.5rem; font-weight: bold;">移动执法端</span>
</template>
<template #label>
<span style="font-size: 0.32rem;">进入执法端首页</span>
</template>
</van-cell>
<van-cell
is-link
@ -56,9 +54,6 @@
<template #title>
<span style="font-size: 0.5rem; font-weight: bold;">移动监督端</span>
</template>
<template #label>
<span style="font-size: 0.32rem;">进入移动监督端</span>
</template>
</van-cell>
</div>
</van-popup>

Write Preview
Loading…
Cancel
Save