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

Merge branch 'dev' of http://146.56.199.25:3000/zhuibobo/EnforcementCode-2.0 into dev

dev
wangmingyong@163.com 2 months ago
parent
00a574adac 39fea9e2c2
commit
27f9a320c2
24 changed files with 765 additions and 8 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. 25
      script/sql/businessdatasyn/一期/enforcement_inspection_program.sql
  2. 33
      script/sql/businessdatasyn/一期/enterprise_complaint.sql
  3. 30
      script/sql/businessdatasyn/一期/enterprise_evaluate.sql
  4. 43
      script/sql/businessdatasyn/一期/enterprise_law_enforcement.sql
  5. 28
      script/sql/businessdatasyn/二期/enforcement_inspection_program.sql
  6. 37
      script/sql/businessdatasyn/二期/enterprise_complaint.sql
  7. 33
      script/sql/businessdatasyn/二期/enterprise_evaluate.sql
  8. 45
      script/sql/businessdatasyn/二期/enterprise_law_enforcement.sql
  9. 3
      script/sql/zfjd-refactoring-v1/其他/njy/njy.sql
  10. 41
      zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/businessdatasyn/hash/RowHashUtil.java
  11. 2
      zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/businessdatasyn/reader/V1SourceReader.java
  12. 2
      zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/businessdatasyn/reader/V2SourceReader.java
  13. 5
      zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnforcementRegistrationBo.java
  14. 4
      zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EnforcementRegistrationVo.java
  15. 3
      zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementRegistrationMapper.xml
  16. 2
      zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/report/EnforcementRegistrationEINOFTReportMapper.xml
  17. 11
      zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/report/EnforcementRegistrationReportMapper.xml
  18. 3
      zdxt-modules/zdxt-system/src/main/java/org/dromara/system/controller/system/SysDictDataController.java
  19. 2
      zdxt-modules/zdxt-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java
  20. 32
      zdxt-web-client/zdxt-admin-plus-ui/src/views/efcode/biz/index.vue
  21. 87
      zdxt-web-server/zdxt-admin-web-server/src/main/resources/businessdatasyn/enforcement_inspection_program.json
  22. 99
      zdxt-web-server/zdxt-admin-web-server/src/main/resources/businessdatasyn/enterprise_complaint.json
  23. 93
      zdxt-web-server/zdxt-admin-web-server/src/main/resources/businessdatasyn/enterprise_information.json
  24. 110
      zdxt-web-server/zdxt-admin-web-server/src/main/resources/businessdatasyn/non_enforcement_registration.json

25
script/sql/businessdatasyn/一期/enforcement_inspection_program.sql
View File

@ -0,0 +1,25 @@
create table enforcement_inspection_program
(
id varchar(50) not null comment '主键ID'
primary key,
plan_year varchar(10) null comment '计划年度',
plan_name varchar(300) null comment '计划名称',
enforcement_department varchar(200) null comment '执法部门',
enforcement_department_id varchar(50) null comment '执法部门ID',
enforcement_time datetime null comment '执法时间',
enforcement_area varchar(300) null comment '执法区域',
create_time datetime null comment '创建时间',
create_by varchar(255) null comment '创建人',
user_id varchar(50) null comment '用户ID',
dept_id varchar(50) null comment '部门ID',
is_delete int default 0 null comment '是否删除 0 否 1是',
is_publish int null comment '是否发布 0否1是',
bureau_dept_id varchar(32) null,
bureau_dept_name varchar(200) null,
time_type varchar(10) null comment '日期类型， year 年度 quarter 季度 mouth 月度',
mouth int null comment '月份 1 - 12',
quarter int null comment '季度',
update_time datetime default CURRENT_TIMESTAMP null on update CURRENT_TIMESTAMP
)
comment '执法检查计划' row_format = DYNAMIC;

33
script/sql/businessdatasyn/一期/enterprise_complaint.sql
View File

@ -0,0 +1,33 @@
create table enterprise_complaint
(
id varchar(50) not null comment '主键ID'
primary key,
rel_id varchar(50) null comment '关联执法记录ID',
enforce_type int null comment '执法类型',
problem_description varchar(400) null comment '问题描述',
linkman varchar(20) null comment '联系人',
linkman_tel varchar(20) null comment '联系方式',
create_time datetime null comment '创建时间',
is_delete int null comment '是否删除 0 否 1 是',
`case type` varchar(50) null comment '投诉对接12345案件类型',
authorization int null,
com_or_opi int default 0 null,
enterprise_address varchar(500) null,
pro_wo_code varchar(55) null,
status int null,
evaluate_time datetime null,
enterprise_number varchar(50) null,
enterprise_name varchar(200) null,
complaint_departments varchar(400) null comment '执法部门多个-逗号隔开',
complaint_department_ids varchar(400) null comment '执法部门id多个-逗号隔开',
enforcement_time datetime null comment '执法时间',
complaint_type int default 0 null comment '投诉类型 0 系默认 1 联合检查',
complaint_item_codes varchar(400) null comment '投诉事项编码，多个逗号隔开',
complaint_item_names varchar(200) null comment '投诉事项名称，多个逗号隔开',
handle_time varchar(22) null comment '同步过来的处理时间',
complaint_record_item varchar(500) null comment '投诉事项（对应记录表执法/入企事项）',
record_type int null comment '数据类型 0行政 1 非行政',
update_time datetime default CURRENT_TIMESTAMP null on update CURRENT_TIMESTAMP
)
comment '企业执法-在线投诉' row_format = DYNAMIC;

30
script/sql/businessdatasyn/一期/enterprise_evaluate.sql
View File

@ -0,0 +1,30 @@
create table enterprise_evaluate
(
id varchar(32) not null comment '主键ID'
primary key,
enforcement_name varchar(100) null comment '案件名称',
enforcement_id varchar(32) null comment '案件ID',
evaluate_description varchar(500) null comment '评价｜意见建议',
linkman varchar(10) null comment '联系人',
linkman_tel varchar(12) null comment '联系电话',
authorization int null comment '是否授权 0 否 1是',
create_time datetime null comment '创建时间',
inspection_efficiency int null,
check_effect int null,
service_experience int null,
check_quality int null,
batch_id varchar(55) null,
check_effectiveness int null comment '检查效果（启用）',
check_attitude int null comment '执法态度（启用）',
procedural_legality int null comment '程序合法（启用）',
satisfaction_level int null comment '满意程度：不满意：1，较满意：2，非常满意：3',
other_problem_switch int null comment '其他问题开关：打开：1；关闭：2',
problem1 int null comment '1是0否存在逐利检查，接受被检查企业的馈赠、报酬、福利等；',
problem2 int null comment '1是0否存在要求被检查企业提供宴请、娱乐、旅游等活动；',
problem3 int null comment '是否存在干扰企业正常生产经营，刻意要求法定代表人到场行为；',
problem4 int null comment '是否存在任性处罚企业，乱查封、乱扣押、乱冻结、动辄责令停产停业的行为；',
problem5 int null comment '是否存在变相检查，以观摩、督导、考察等名义行检查之实.',
update_time datetime default CURRENT_TIMESTAMP null on update CURRENT_TIMESTAMP
)
comment '企业端-执法评价' row_format = DYNAMIC;

43
script/sql/businessdatasyn/一期/enterprise_law_enforcement.sql
View File

@ -0,0 +1,43 @@
create table enterprise_law_enforcement
(
id varchar(50) not null comment '主键ID'
primary key,
law_enforcement varchar(100) null comment '执法部门',
law_enforcement_id varchar(50) null comment '执法部门ID',
enterprise_id varchar(50) null comment '企业ID',
enterprise_name varchar(100) null comment '企业名称',
check_time date null,
create_time datetime null comment '创建时间',
create_by varchar(50) null comment '创建人',
law_enforcer varchar(50) null comment '执法人员姓名',
law_enforcer_id varchar(50) null comment '执法人员ID',
remark varchar(500) null comment '备注',
user_id mediumtext null,
dept_id varchar(55) null,
is_delete int default 0 null comment '是否删除 0 否 1 是',
status int null comment '数据状态 0 正常 1 取消',
law_enforcement_code varchar(50) null comment '登记编号',
link_man varchar(50) null comment '企业联系人',
link_tel varchar(15) null comment '联系人电话',
check_item varchar(500) null comment '检查事项',
check_require varchar(500) null comment '检查要求',
enterprise_number varchar(50) null comment '企业信用代码',
law_enforcer_two varchar(50) null comment '执法人员2姓名',
law_enforcer_two_id varchar(50) null comment '执法人员2ID',
is_submit int default 0 not null comment '保存状态(0:临时保存; 1:保存)',
unite_check varchar(50) null,
is_unite int default 0 null,
is_reg int default 0 null,
main_deputy_order int default 1 null,
tmp_dept_json varchar(2000) null,
check_item_text varchar(1000) null,
check_require_text varchar(1000) null,
bureau_dept_id varchar(32) null,
bureau_dept_name varchar(200) null,
check_time_order int null,
check_hour_start varchar(10) null comment '执法时间 开始时段',
check_hour_end varchar(10) null comment '执法时间 结束时段',
update_time datetime default CURRENT_TIMESTAMP null on update CURRENT_TIMESTAMP
)
comment '企业端-执法部门预约记录表' row_format = DYNAMIC;

28
script/sql/businessdatasyn/二期/enforcement_inspection_program.sql
View File

@ -0,0 +1,28 @@
create table enforcement_inspection_program
(
id varchar(50) not null comment '主键ID'
primary key,
plan_year varchar(10) null comment '计划年度',
plan_name varchar(300) null comment '计划名称',
enforcement_department varchar(200) null comment '执法部门',
enforcement_department_id varchar(50) null comment '执法部门ID',
enforcement_time datetime null comment '执法时间',
enforcement_area varchar(300) null comment '执法区域',
create_time datetime null comment '创建时间',
create_by varchar(255) null comment '创建人',
user_id varchar(50) null comment '用户ID',
dept_id varchar(50) null comment '部门ID',
is_delete int default 0 null comment '是否删除 0 否 1是',
is_publish int null comment '是否发布 0否1是',
bureau_dept_id varchar(32) null,
bureau_dept_name varchar(200) null,
time_type varchar(10) null comment '日期类型， year 年度 quarter 季度 mouth 月度',
mouth int null comment '月份 1 - 12',
quarter int null comment '季度',
create_dept varchar(100) null comment '创建部门',
update_by varchar(50) null comment '更新者',
update_time datetime default CURRENT_TIMESTAMP null on update CURRENT_TIMESTAMP,
create_by_name varchar(64) null comment '创建人姓名'
)
comment '执法检查计划' row_format = DYNAMIC;

37
script/sql/businessdatasyn/二期/enterprise_complaint.sql
View File

@ -0,0 +1,37 @@
create table enterprise_complaint
(
id varchar(50) not null comment '主键ID'
primary key,
rel_id varchar(50) null comment '关联执法记录ID',
enforce_type int null comment '执法类型',
problem_description varchar(400) null comment '问题描述',
linkman varchar(20) null comment '联系人',
linkman_tel varchar(20) null comment '联系方式',
create_time datetime null comment '创建时间',
is_delete int null comment '是否删除 0 否 1 是',
case_type varchar(50) null comment '投诉对接12345案件类型',
authorization int null,
com_or_opi int default 0 null,
enterprise_address varchar(500) null,
detailed_address varchar(200) null comment '详细地址',
pro_wo_code varchar(55) null,
status int null,
evaluate_time datetime null,
enterprise_number varchar(50) null,
enterprise_name varchar(200) null,
complaint_departments varchar(400) null comment '执法部门多个-逗号隔开',
complaint_department_ids varchar(400) null comment '执法部门id多个-逗号隔开',
enforcement_time datetime null comment '执法时间',
complaint_type int default 0 null comment '投诉类型 0 系默认 1 联合检查',
complaint_item_codes varchar(400) null comment '投诉事项编码，多个逗号隔开',
complaint_item_names varchar(200) null comment '投诉事项名称，多个逗号隔开',
handle_time varchar(22) null comment '同步过来的处理时间',
complaint_record_item varchar(500) null comment '投诉事项（对应记录表执法/入企事项）',
record_type int null comment '数据类型 0行政 1 非行政',
create_dept varchar(100) null comment '创建部门',
create_by varchar(50) null comment '创建者',
update_by varchar(50) null comment '更新者',
update_time datetime default CURRENT_TIMESTAMP null on update CURRENT_TIMESTAMP
)
comment '企业执法-在线投诉' row_format = DYNAMIC;

33
script/sql/businessdatasyn/二期/enterprise_evaluate.sql
View File

@ -0,0 +1,33 @@
create table enterprise_evaluate
(
id varchar(32) not null comment '主键ID'
primary key,
enforcement_name varchar(100) null comment '案件名称',
enforcement_id varchar(32) null comment '案件ID',
evaluate_description varchar(500) null comment '评价｜意见建议',
linkman varchar(10) null comment '联系人',
linkman_tel varchar(12) null comment '联系电话',
authorization int null comment '是否授权 0 否 1是',
create_time datetime null comment '创建时间',
inspection_efficiency int null,
check_effect int null,
service_experience int null,
check_quality int null,
batch_id varchar(55) null,
check_effectiveness int null comment '检查效果（启用）',
check_attitude int null comment '执法态度（启用）',
procedural_legality int null comment '程序合法（启用）',
satisfaction_level int null comment '满意程度：不满意：1，较满意：2，非常满意：3',
other_problem_switch int null comment '其他问题开关：打开：1；关闭：2',
problem1 int null comment '1是0否存在逐利检查，接受被检查企业的馈赠、报酬、福利等；',
problem2 int null comment '1是0否存在要求被检查企业提供宴请、娱乐、旅游等活动；',
problem3 int null comment '是否存在干扰企业正常生产经营，刻意要求法定代表人到场行为；',
problem4 int null comment '是否存在任性处罚企业，乱查封、乱扣押、乱冻结、动辄责令停产停业的行为；',
problem5 int null comment '是否存在变相检查，以观摩、督导、考察等名义行检查之实.',
create_dept varchar(100) null comment '创建部门',
create_by varchar(50) null comment '创建者',
update_by varchar(50) null comment '更新者',
update_time datetime default CURRENT_TIMESTAMP null on update CURRENT_TIMESTAMP
)
comment '企业端-执法评价' row_format = DYNAMIC;

45
script/sql/businessdatasyn/二期/enterprise_law_enforcement.sql
View File

@ -0,0 +1,45 @@
create table enterprise_law_enforcement
(
id varchar(50) not null comment '主键ID'
primary key,
law_enforcement varchar(100) null comment '执法部门',
law_enforcement_id varchar(50) null comment '执法部门ID',
enterprise_id varchar(50) null comment '企业ID',
enterprise_name varchar(100) null comment '企业名称',
check_time date null,
create_time datetime null comment '创建时间',
create_by varchar(50) null comment '创建人',
law_enforcer varchar(50) null comment '执法人员姓名',
law_enforcer_id varchar(50) null comment '执法人员ID',
remark varchar(500) null comment '备注',
user_id mediumtext null,
dept_id varchar(55) null,
is_delete int default 0 null comment '是否删除 0 否 1 是',
status int null comment '数据状态 0 正常 1 取消',
law_enforcement_code varchar(50) null comment '登记编号',
link_man varchar(50) null comment '企业联系人',
link_tel varchar(15) null comment '联系人电话',
check_item varchar(500) null comment '检查事项',
check_require varchar(500) null comment '检查要求',
enterprise_number varchar(50) null comment '企业信用代码',
law_enforcer_two varchar(50) null comment '执法人员2姓名',
law_enforcer_two_id varchar(50) null comment '执法人员2ID',
is_submit int default 0 not null comment '保存状态(0:临时保存; 1:保存)',
unite_check varchar(50) null,
is_unite int default 0 null,
is_reg int default 0 null,
main_deputy_order int default 1 null,
tmp_dept_json varchar(2000) null,
check_item_text varchar(1000) null,
check_require_text varchar(1000) null,
bureau_dept_id varchar(32) null,
bureau_dept_name varchar(200) null,
check_time_order int null,
check_hour_start varchar(10) null comment '执法时间 开始时段',
check_hour_end varchar(10) null comment '执法时间 结束时段',
create_dept varchar(100) null comment '创建部门',
update_by varchar(50) null comment '更新者',
update_time datetime default CURRENT_TIMESTAMP null on update CURRENT_TIMESTAMP
)
comment '企业端-执法部门预约记录表' row_format = DYNAMIC;

3
script/sql/zfjd-refactoring-v1/其他/njy/njy.sql
View File

@ -3,3 +3,6 @@ ALTER TABLE enterprise_complaint
AFTER enterprise_address;
ALTER TABLE enforcement_inspection_program ADD COLUMN create_by_name VARCHAR(64) COMMENT '创建人姓名';
ALTER TABLE enforcement_registration ADD COLUMN other_reasons varchar(500) DEFAULT NULL COMMENT '其他原因';

41
zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/businessdatasyn/hash/RowHashUtil.java
View File

@ -118,4 +118,45 @@ public final class RowHashUtil {
}
return sb.toString();
}
/**
* 判定逻辑删除标记是否为“已删除”。
* <p>兼容多种 JDBC 返回类型：</p>
* <ul>
* <li>bit(1) → Boolean（MySQL 驱动）</li>
* <li>bit/tinyint → byte[] 或 Number</li>
* <li>tinyint/int → Number（0=未删，非0=已删）</li>
* <li>varchar → "1"/"true"/"y" 视为已删</li>
* </ul>
*
* @param flag 删除标记列的原始值
* @return true=已删除
*/
public static boolean isDeleted(Object flag) {
if (flag == null) {
return false;
}
if (flag instanceof Boolean b) {
return b;
}
if (flag instanceof Number n) {
return n.longValue() != 0L;
}
if (flag instanceof byte[] bytes) {
for (byte bt : bytes) {
if (bt != 0) {
return true;
}
}
return false;
}
String s = flag.toString().trim();
if (s.isEmpty()) {
return false;
}
return "1".equals(s)
|| "true".equalsIgnoreCase(s)
|| "y".equalsIgnoreCase(s)
|| "yes".equalsIgnoreCase(s);
}
}

2
zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/businessdatasyn/reader/V1SourceReader.java
View File

@ -137,7 +137,7 @@ public class V1SourceReader implements SourceReader {
boolean deleted = false;
if (side.getDeleteFlagColumn() != null) {
Object flag = row.get(side.getDeleteFlagColumn());
deleted = flag != null && !"0".equals(flag.toString());
deleted = RowHashUtil.isDeleted(flag);
}
return RowSnapshot.builder()

2
zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/businessdatasyn/reader/V2SourceReader.java
View File

@ -136,7 +136,7 @@ public class V2SourceReader implements SourceReader {
boolean deleted = false;
if (side.getDeleteFlagColumn() != null) {
Object flag = row.get(side.getDeleteFlagColumn());
deleted = flag != null && !"0".equals(flag.toString());
deleted = RowHashUtil.isDeleted(flag);
}
return RowSnapshot.builder()

5
zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnforcementRegistrationBo.java
View File

@ -321,4 +321,9 @@ public class EnforcementRegistrationBo extends BaseEntity {
*/
private Integer warnType;
/**
* 其他原因
*/
private String otherReasons;
}

4
zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EnforcementRegistrationVo.java
View File

@ -410,4 +410,8 @@ public class EnforcementRegistrationVo implements Serializable {
private List<ZdxtFileVo> fileList;
/**
* 其他原因
*/
private String otherReasons;
}

3
zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementRegistrationMapper.xml
View File

@ -315,6 +315,7 @@
<if test="lawEnforceCategory != null and lawEnforceCategory!=''"> law_enforce_category = #{lawEnforceCategory},</if>
<if test="entrustDeptId != null and entrustDeptId!=''"> entrust_dept_id=#{entrustDeptId},</if>
<if test="entrustDeptName != null and entrustDeptName!=''"> entrust_dept_name=#{entrustDeptName},</if>
<if test="otherReasons != null and otherReasons != ''"> other_reasons = #{otherReasons},</if>
</trim>
where id = #{id}
</update>
@ -383,6 +384,7 @@
<if test="lawEnforceCategory != null and lawEnforceCategory!=''"> law_enforce_category,</if>
<if test="entrustDeptId != null and entrustDeptId!=''"> entrust_dept_id,</if>
<if test="entrustDeptName != null and entrustDeptName!=''"> entrust_dept_name,</if>
<if test="otherReasons != null and otherReasons != ''"> other_reasons,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null and id != ''">#{id},</if>
@ -437,6 +439,7 @@
<if test="lawEnforceCategory != null and lawEnforceCategory!=''"> #{lawEnforceCategory},</if>
<if test="entrustDeptId != null and entrustDeptId!=''"> #{entrustDeptId},</if>
<if test="entrustDeptName != null and entrustDeptName!=''"> #{entrustDeptName},</if>
<if test="otherReasons != null and otherReasons != ''"> #{otherReasons},</if>
</trim>
</insert>

2
zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/report/EnforcementRegistrationEINOFTReportMapper.xml
View File

@ -41,7 +41,7 @@
<where>
<include refid="einoftWhereCondition"/>
</where>
GROUP BY er.enterprise_number
GROUP BY er.enterprise_number, er.enterprise_name, er.district, er.street
) t
<where>
<if test="bo.num != null and bo.num != ''">

11
zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/report/EnforcementRegistrationReportMapper.xml
View File

@ -152,7 +152,8 @@
er.is_evaluate, er.law_id, er.law_text,
er.has_union, er.has_auto, er.union_no, er.law_enforce_category,
er.entrust_dept_id, er.entrust_dept_name,
er.enterprise_address, er.district, er.street, er.zone, er.is_real_union
er.enterprise_address, er.district, er.street, er.zone, er.is_real_union,
er.other_reasons
FROM enforcement_registration er
LEFT JOIN sys_dict_data area
ON area.dict_type = 'address_type'
@ -351,7 +352,9 @@
<include refid="reportWhereCondition"/>
AND enterprise_number IS NOT NULL AND enterprise_number != ''
</where>
GROUP BY enterprise_number
GROUP BY enterprise_number, enterprise_name, district, street,
bureau_dept_name, law_enforcer, law_enforcer_two,
law_enforcement_item_text, enforcement_time
ORDER BY enforcement_time DESC
) t
<where>
@ -453,7 +456,9 @@
${dataFilter}
</if>
</where>
GROUP BY er.enterprise_number
GROUP BY er.enterprise_number, er.enterprise_name, er.district, er.street,
er.bureau_dept_id, er.bureau_dept_name, er.law_enforcer, er.law_enforcer_two,
er.law_enforcement_item_text
) t
LEFT JOIN sys_dict_data area
ON area.dict_type = 'address_type'

3
zdxt-modules/zdxt-system/src/main/java/org/dromara/system/controller/system/SysDictDataController.java
View File

@ -1,6 +1,7 @@
package org.dromara.system.controller.system;
import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.dev33.satoken.annotation.SaIgnore;
import cn.hutool.core.util.ObjectUtil;
import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;
@ -81,7 +82,7 @@ public class SysDictDataController extends BaseController {
}
return R.ok(data);
}
@SaIgnore
@GetMapping(value = "/dictType")
public R<List<SysDictDataVo>> dictTypes(String dictType) {
List<SysDictDataVo> data = dictTypeService.selectDictDataByType(dictType);

2
zdxt-modules/zdxt-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java
View File

@ -101,7 +101,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService
* @param dictType 字典类型
* @return 字典数据集合信息
*/
@Cacheable(cacheNames = CacheNames.SYS_DICT, key = "#dictType")
//@Cacheable(cacheNames = CacheNames.SYS_DICT, key = "#dictType")
@Override
public List<SysDictDataVo> selectDictDataByType(String dictType) {
List<SysDictDataVo> dictDatas = dictDataMapper.selectDictDataByType(dictType);

32
zdxt-web-client/zdxt-admin-plus-ui/src/views/efcode/biz/index.vue
View File

@ -25,6 +25,38 @@ const syncConfigs = ref([
v2Table: 'enforcement_registration',
syncDirection: '双向',
enabled: true
},
{
configKey: 'non_enforcement_registration',
description: '非行政执法登记表双向同步',
v1Table: 'non_enforcement_registration',
v2Table: 'non_enforcement_registration',
syncDirection: '双向',
enabled: true
},
{
configKey: 'enterprise_information',
description: '企业信息表双向同步',
v1Table: 'enterprise_information',
v2Table: 'enterprise_information',
syncDirection: '双向',
enabled: true
},
{
configKey: 'enforcement_inspection_program',
description: '执法检查计划表双向同步',
v1Table: 'enforcement_inspection_program',
v2Table: 'enforcement_inspection_program',
syncDirection: '双向',
enabled: true
},
{
configKey: 'enterprise_complaint',
description: '企业执法在线投诉表双向同步',
v1Table: 'enterprise_complaint',
v2Table: 'enterprise_complaint',
syncDirection: '双向',
enabled: true
}
]);

87
zdxt-web-server/zdxt-admin-web-server/src/main/resources/businessdatasyn/enforcement_inspection_program.json
View File

@ -0,0 +1,87 @@
{
"configKey": "enforcement_inspection_program",
"description": "执法检查计划表双向同步",
"enabled": true,
"v1": {
"table": "enforcement_inspection_program",
"primaryKey": ["id"],
"updateTimeColumn": "update_time",
"deleteFlagColumn": "is_delete",
"columns": [
"id", "plan_year", "plan_name",
"enforcement_department", "enforcement_department_id",
"enforcement_time", "enforcement_area",
"create_time", "create_by", "user_id", "dept_id",
"is_delete", "is_publish", "bureau_dept_id", "bureau_dept_name",
"time_type", "mouth", "quarter", "update_time"
]
},
"v2": {
"table": "enforcement_inspection_program",
"primaryKey": ["id"],
"updateTimeColumn": "update_time",
"deleteFlagColumn": "is_delete",
"columns": [
"id", "plan_year", "plan_name",
"enforcement_department", "enforcement_department_id",
"enforcement_time", "enforcement_area",
"create_time", "create_by", "user_id", "dept_id",
"is_delete", "is_publish", "bureau_dept_id", "bureau_dept_name",
"time_type", "mouth", "quarter",
"create_dept", "update_by", "update_time", "create_by_name"
]
},
"columnMapping": {
"id": "id",
"plan_year": "plan_year",
"plan_name": "plan_name",
"enforcement_department": "enforcement_department",
"enforcement_department_id": "enforcement_department_id",
"enforcement_time": "enforcement_time",
"enforcement_area": "enforcement_area",
"create_time": "create_time",
"create_by": "create_by",
"user_id": "user_id",
"dept_id": "dept_id",
"is_delete": "is_delete",
"is_publish": "is_publish",
"bureau_dept_id": "bureau_dept_id",
"bureau_dept_name": "bureau_dept_name",
"time_type": "time_type",
"mouth": "mouth",
"quarter": "quarter",
"update_time": "update_time"
},
"hashColumns": [
"plan_year", "plan_name",
"enforcement_department", "enforcement_department_id",
"enforcement_time", "enforcement_area",
"is_publish", "bureau_dept_id", "bureau_dept_name",
"time_type", "mouth", "quarter"
],
"typeConverters": {},
"v2OnlyColumnsIgnoredOnV1": ["create_dept", "update_by", "create_by_name"],
"v2OnlyColumnsDefaults": {
"create_dept": null,
"update_by": null,
"create_by_name": null
},
"firstOwnerFallback": "V1",
"deleteMode": "logical",
"logicalDelete": {
"v1": { "column": "is_delete", "value": 1 },
"v2": { "column": "is_delete", "value": 1 }
},
"strictOwnerMode": false,
"scanBatchSize": 1000,
"maxRetry": 5
}

99
zdxt-web-server/zdxt-admin-web-server/src/main/resources/businessdatasyn/enterprise_complaint.json
View File

@ -0,0 +1,99 @@
{
"configKey": "enterprise_complaint",
"description": "企业执法在线投诉表双向同步",
"enabled": true,
"v1": {
"table": "enterprise_complaint",
"primaryKey": ["id"],
"updateTimeColumn": "update_time",
"deleteFlagColumn": "is_delete",
"columns": [
"id", "rel_id", "enforce_type", "problem_description",
"linkman", "linkman_tel", "create_time", "is_delete",
"authorization", "com_or_opi", "enterprise_address", "pro_wo_code",
"status", "evaluate_time", "enterprise_number", "enterprise_name",
"complaint_departments", "complaint_department_ids", "enforcement_time",
"complaint_type", "complaint_item_codes", "complaint_item_names",
"handle_time", "complaint_record_item", "record_type", "update_time"
]
},
"v2": {
"table": "enterprise_complaint",
"primaryKey": ["id"],
"updateTimeColumn": "update_time",
"deleteFlagColumn": "is_delete",
"columns": [
"id", "rel_id", "enforce_type", "problem_description",
"linkman", "linkman_tel", "create_time", "is_delete",
"authorization", "com_or_opi", "enterprise_address", "pro_wo_code",
"status", "evaluate_time", "enterprise_number", "enterprise_name",
"complaint_departments", "complaint_department_ids", "enforcement_time",
"complaint_type", "complaint_item_codes", "complaint_item_names",
"handle_time", "complaint_record_item", "record_type", "update_time",
"detailed_address", "create_dept", "create_by", "update_by"
]
},
"columnMapping": {
"id": "id",
"rel_id": "rel_id",
"enforce_type": "enforce_type",
"problem_description": "problem_description",
"linkman": "linkman",
"linkman_tel": "linkman_tel",
"create_time": "create_time",
"is_delete": "is_delete",
"authorization": "authorization",
"com_or_opi": "com_or_opi",
"enterprise_address": "enterprise_address",
"pro_wo_code": "pro_wo_code",
"status": "status",
"evaluate_time": "evaluate_time",
"enterprise_number": "enterprise_number",
"enterprise_name": "enterprise_name",
"complaint_departments": "complaint_departments",
"complaint_department_ids": "complaint_department_ids",
"enforcement_time": "enforcement_time",
"complaint_type": "complaint_type",
"complaint_item_codes": "complaint_item_codes",
"complaint_item_names": "complaint_item_names",
"handle_time": "handle_time",
"complaint_record_item": "complaint_record_item",
"record_type": "record_type",
"update_time": "update_time"
},
"hashColumns": [
"rel_id", "enforce_type", "problem_description",
"linkman", "linkman_tel",
"authorization", "com_or_opi", "enterprise_address", "pro_wo_code",
"status", "evaluate_time", "enterprise_number", "enterprise_name",
"complaint_departments", "complaint_department_ids", "enforcement_time",
"complaint_type", "complaint_item_codes", "complaint_item_names",
"handle_time", "complaint_record_item", "record_type"
],
"typeConverters": {},
"v2OnlyColumnsIgnoredOnV1": ["detailed_address", "create_dept", "create_by", "update_by"],
"v2OnlyColumnsDefaults": {
"detailed_address": null,
"create_dept": null,
"create_by": null,
"update_by": null
},
"firstOwnerFallback": "V1",
"deleteMode": "logical",
"logicalDelete": {
"v1": { "column": "is_delete", "value": 1 },
"v2": { "column": "is_delete", "value": 1 }
},
"strictOwnerMode": false,
"scanBatchSize": 1000,
"maxRetry": 5
}

93
zdxt-web-server/zdxt-admin-web-server/src/main/resources/businessdatasyn/enterprise_information.json
View File

@ -0,0 +1,93 @@
{
"configKey": "enterprise_information",
"description": "企业信息表双向同步",
"enabled": true,
"v1": {
"table": "enterprise_information",
"primaryKey": ["id"],
"updateTimeColumn": "update_time",
"deleteFlagColumn": "is_delete",
"columns": [
"id", "enterprise_name", "enterprise_number", "enterprise_type",
"enterprise_address", "legal_person", "registered_capital",
"establishment_time", "operating_term", "business_scope",
"create_time", "create_by", "user_id", "dept_id",
"qr_code_id", "last_qr_code_time", "is_unsubscribe", "is_delete",
"salt", "enterprise_tel", "company_org_type", "industry",
"operating_term_end", "update_time"
]
},
"v2": {
"table": "enterprise_information",
"primaryKey": ["id"],
"updateTimeColumn": "update_time",
"deleteFlagColumn": "is_delete",
"columns": [
"id", "enterprise_name", "enterprise_number", "enterprise_type",
"enterprise_address", "legal_person", "registered_capital",
"establishment_time", "operating_term", "business_scope",
"create_time", "create_by", "user_id", "dept_id",
"qr_code_id", "last_qr_code_time", "is_unsubscribe", "is_delete",
"salt", "enterprise_tel", "company_org_type", "industry",
"operating_term_end", "create_dept", "update_by", "update_time"
]
},
"columnMapping": {
"id": "id",
"enterprise_name": "enterprise_name",
"enterprise_number": "enterprise_number",
"enterprise_type": "enterprise_type",
"enterprise_address": "enterprise_address",
"legal_person": "legal_person",
"registered_capital": "registered_capital",
"establishment_time": "establishment_time",
"operating_term": "operating_term",
"business_scope": "business_scope",
"create_time": "create_time",
"create_by": "create_by",
"user_id": "user_id",
"dept_id": "dept_id",
"qr_code_id": "qr_code_id",
"last_qr_code_time": "last_qr_code_time",
"is_unsubscribe": "is_unsubscribe",
"is_delete": "is_delete",
"salt": "salt",
"enterprise_tel": "enterprise_tel",
"company_org_type": "company_org_type",
"industry": "industry",
"operating_term_end": "operating_term_end",
"update_time": "update_time"
},
"hashColumns": [
"enterprise_name", "enterprise_number", "enterprise_type",
"enterprise_address", "legal_person", "registered_capital",
"establishment_time", "operating_term", "business_scope",
"qr_code_id", "last_qr_code_time", "is_unsubscribe",
"salt", "enterprise_tel", "company_org_type", "industry",
"operating_term_end"
],
"typeConverters": {},
"v2OnlyColumnsIgnoredOnV1": ["create_dept", "update_by"],
"v2OnlyColumnsDefaults": {
"create_dept": null,
"update_by": null
},
"firstOwnerFallback": "V1",
"deleteMode": "logical",
"logicalDelete": {
"v1": { "column": "is_delete", "value": 1 },
"v2": { "column": "is_delete", "value": 1 }
},
"strictOwnerMode": false,
"scanBatchSize": 1000,
"maxRetry": 5
}

110
zdxt-web-server/zdxt-admin-web-server/src/main/resources/businessdatasyn/non_enforcement_registration.json
View File

@ -0,0 +1,110 @@
{
"configKey": "non_enforcement_registration",
"description": "非行政执法登记表双向同步",
"enabled": true,
"v1": {
"table": "non_enforcement_registration",
"primaryKey": ["id"],
"updateTimeColumn": "update_time",
"deleteFlagColumn": "has_delete",
"columns": [
"id", "enterprise_name", "enterprise_number", "enforcement_time",
"law_enforcer", "law_enforcer_id", "law_enforcer_other", "law_enforcer_id_other",
"law_enforcement_type", "law_enforcement_type_text",
"law_enforcement_item", "law_enforcement_item_text",
"law_enforcement_basis", "law_enforcement_basis_text", "remark",
"reslut", "status", "has_delete", "has_complaint", "has_submit", "has_evaluate",
"law_id", "law_text", "bureau_dept_id", "bureau_dept_name", "creditcode",
"user_id", "dept_id", "create_by", "update_by", "create_time", "update_time",
"enterprise_address", "district", "street", "reason"
]
},
"v2": {
"table": "non_enforcement_registration",
"primaryKey": ["id"],
"updateTimeColumn": "update_time",
"deleteFlagColumn": "has_delete",
"columns": [
"id", "enterprise_name", "enterprise_number", "enforcement_time",
"law_enforcer", "law_enforcer_id", "law_enforcer_other", "law_enforcer_id_other",
"law_enforcement_type", "law_enforcement_type_text",
"law_enforcement_item", "law_enforcement_item_text",
"law_enforcement_basis", "law_enforcement_basis_text", "remark",
"reslut", "status", "has_delete", "has_complaint", "has_submit", "has_evaluate",
"law_id", "law_text", "bureau_dept_id", "bureau_dept_name", "creditcode",
"user_id", "dept_id", "create_by", "update_by", "create_time", "update_time",
"enterprise_address", "district", "street", "reason", "create_dept"
]
},
"columnMapping": {
"id": "id",
"enterprise_name": "enterprise_name",
"enterprise_number": "enterprise_number",
"enforcement_time": "enforcement_time",
"law_enforcer": "law_enforcer",
"law_enforcer_id": "law_enforcer_id",
"law_enforcer_other": "law_enforcer_other",
"law_enforcer_id_other": "law_enforcer_id_other",
"law_enforcement_type": "law_enforcement_type",
"law_enforcement_type_text": "law_enforcement_type_text",
"law_enforcement_item": "law_enforcement_item",
"law_enforcement_item_text": "law_enforcement_item_text",
"law_enforcement_basis": "law_enforcement_basis",
"law_enforcement_basis_text": "law_enforcement_basis_text",
"remark": "remark",
"reslut": "reslut",
"status": "status",
"has_delete": "has_delete",
"has_complaint": "has_complaint",
"has_submit": "has_submit",
"has_evaluate": "has_evaluate",
"law_id": "law_id",
"law_text": "law_text",
"bureau_dept_id": "bureau_dept_id",
"bureau_dept_name": "bureau_dept_name",
"creditcode": "creditcode",
"user_id": "user_id",
"dept_id": "dept_id",
"create_by": "create_by",
"update_by": "update_by",
"create_time": "create_time",
"update_time": "update_time",
"enterprise_address": "enterprise_address",
"district": "district",
"street": "street",
"reason": "reason"
},
"hashColumns": [
"enterprise_name", "enterprise_number", "enforcement_time",
"law_enforcer", "law_enforcer_id", "law_enforcer_other", "law_enforcer_id_other",
"law_enforcement_type", "law_enforcement_type_text",
"law_enforcement_item", "law_enforcement_item_text",
"law_enforcement_basis", "law_enforcement_basis_text", "remark",
"reslut", "status", "has_complaint", "has_submit", "has_evaluate",
"law_id", "law_text", "bureau_dept_id", "bureau_dept_name", "creditcode",
"enterprise_address", "district", "street", "reason"
],
"typeConverters": {},
"v2OnlyColumnsIgnoredOnV1": ["create_dept"],
"v2OnlyColumnsDefaults": {
"create_dept": null
},
"firstOwnerFallback": "V1",
"deleteMode": "logical",
"logicalDelete": {
"v1": { "column": "has_delete", "value": 1 },
"v2": { "column": "has_delete", "value": 1 }
},
"strictOwnerMode": false,
"scanBatchSize": 1000,
"maxRetry": 5
}
Write Preview
Loading…
Cancel
Save