From 8a57670d184802de96e0e4037a2792f7d23450f5 Mon Sep 17 00:00:00 2001 From: vincent Date: Wed, 12 Aug 2026 18:42:58 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=B8=80=E6=9C=9F=E6=89=A7=E6=B3=95?= =?UTF-8?q?=E6=A3=80=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zfjd-refactoring-v1/其他/gh/gh0729.sql | 21 +++++++++++++++++++ .../enforcement/AppEnfCaseInfoController.java | 11 ++++++++++ .../domain/Xzjcjbxx025711.java | 5 ++++- .../mapper/SxtJcdzb107522Mapper.java | 8 +++++++ .../service/ISxtJcdzb107522Service.java | 11 ++++++++++ .../impl/SxtJcdzb107522ServiceImpl.java | 15 +++++++++++++ .../enforcementcode/SxtJcdzb107522Mapper.xml | 18 ++++++++++++++++ 7 files changed, 88 insertions(+), 1 deletion(-) create mode 100644 script/sql/zfjd-refactoring-v1/其他/gh/gh0729.sql diff --git a/script/sql/zfjd-refactoring-v1/其他/gh/gh0729.sql b/script/sql/zfjd-refactoring-v1/其他/gh/gh0729.sql new file mode 100644 index 00000000..ce70af5e --- /dev/null +++ b/script/sql/zfjd-refactoring-v1/其他/gh/gh0729.sql @@ -0,0 +1,21 @@ +DROP TABLE IF EXISTS siq_msg_info; +CREATE TABLE `siq_msg_info` ( + `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键自增ID', + `task_id` varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '任务ID', + `source_id` varchar(64) COLLATE utf8mb4_general_ci NOT NULL COMMENT '来源ID', + `status` tinyint NOT NULL DEFAULT '0' COMMENT '发送给深I企状态：0-待发送；1-发送成功；2-正在发送；3-发送异常；4-发送失败', + `send_status` tinyint DEFAULT '0' COMMENT '站内信发送状态：0-待发送；1-发送成功；2-正在发送；3-发送异常；4-发送失败；5-任务取消', + `send_finished_time` varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '发送完成时间（时间戳，毫秒）', + `error_msg` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '错误信息', + `create_by` varchar(64) COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '创建者', + `create_dept` varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人部门', + `update_by` varchar(64) COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '更新者', + `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `update_time` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + `is_delete` tinyint NOT NULL DEFAULT '0' COMMENT '是否删除 0=否 1=是', + `remark` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '备注', + PRIMARY KEY (`id`), + KEY `idx_task_id` (`task_id`), + KEY `idx_source_id` (`source_id`) +) ENGINE=InnoDB AUTO_INCREMENT=2082371265445888003 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='深I企消息信息表'; + diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfCaseInfoController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfCaseInfoController.java index a0257499..f72cd184 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfCaseInfoController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfCaseInfoController.java @@ -2,6 +2,7 @@ package com.zdxt.enforcementcode.controller.app.enforcement; import cn.dev33.satoken.annotation.SaIgnore; import com.zdxt.enforcementcode.domain.SxtXzqzjbxx173774; +import com.zdxt.enforcementcode.domain.Xzjcjbxx025711; import com.zdxt.enforcementcode.domain.bo.*; import com.zdxt.enforcementcode.domain.vo.*; import com.zdxt.enforcementcode.service.*; @@ -33,6 +34,16 @@ public class AppEnfCaseInfoController { @Autowired private ISxtXzcfajjbxx026705Service sxtXzcfajjbxx026705Service; + /** + * 查询【历史检查信息】列表 + */ + @GetMapping("/oldQueryXzjcList") + public TableDataInfo oldQueryXzjcList(Xzjcjbxx025711 xzjcjboxx,PageQuery pageQuery) + { + TableDataInfo list = sxtJcdzb107522Service.queryByEnterpriseNumber(xzjcjboxx,pageQuery); + return list; + } + /** * 查询【历史检查信息】列表 */ diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/Xzjcjbxx025711.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/Xzjcjbxx025711.java index a5d803ec..23cf47af 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/Xzjcjbxx025711.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/Xzjcjbxx025711.java @@ -284,5 +284,8 @@ public class Xzjcjbxx025711 extends BaseEntity { */ private Long updatestatus; - + /** + * + */ + private String enterpriseNumber; } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/SxtJcdzb107522Mapper.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/SxtJcdzb107522Mapper.java index 8fbb4834..7c01e8c7 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/SxtJcdzb107522Mapper.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/SxtJcdzb107522Mapper.java @@ -2,6 +2,7 @@ package com.zdxt.enforcementcode.mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zdxt.enforcementcode.domain.SxtJcdzb107522; +import com.zdxt.enforcementcode.domain.Xzjcjbxx025711; import com.zdxt.enforcementcode.domain.bo.SxtJcdzb107522Bo; import com.zdxt.enforcementcode.domain.bo.Xzjcjbxx025711Bo; import com.zdxt.enforcementcode.domain.vo.SxtJcdzb107522Vo; @@ -20,4 +21,11 @@ import java.util.List; public interface SxtJcdzb107522Mapper extends BaseMapperPlus { List selectXzjcHistoryList(@Param("bo") SxtJcdzb107522Bo bo, @Param("page") Page page); + + /** + * 一期行政执法检查信息 + * @param xzjcjboxx + * @return + */ + List queryByEnterpriseNumber(@Param("param") Xzjcjbxx025711 xzjcjboxx,@Param("page") Page page); } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/ISxtJcdzb107522Service.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/ISxtJcdzb107522Service.java index 54e8b12c..915ad45c 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/ISxtJcdzb107522Service.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/ISxtJcdzb107522Service.java @@ -1,5 +1,7 @@ package com.zdxt.enforcementcode.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.zdxt.enforcementcode.domain.Xzjcjbxx025711; import com.zdxt.enforcementcode.domain.bo.Xzjcjbxx025711Bo; import com.zdxt.enforcementcode.domain.vo.SxtJcdzb107522Vo; import com.zdxt.enforcementcode.domain.bo.SxtJcdzb107522Bo; @@ -69,4 +71,13 @@ public interface ISxtJcdzb107522Service { Boolean deleteWithValidByIds(Collection ids, Boolean isValid); TableDataInfo selectXzjcHistoryList(SxtJcdzb107522Bo bo, PageQuery pageQuery); + + + /** + * 一期旧的 + * @param xzjcjboxx + * @param pageQuery + * @return + */ + TableDataInfo queryByEnterpriseNumber(Xzjcjbxx025711 xzjcjboxx,PageQuery pageQuery); } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/SxtJcdzb107522ServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/SxtJcdzb107522ServiceImpl.java index d3bb15d8..4f3159e6 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/SxtJcdzb107522ServiceImpl.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/SxtJcdzb107522ServiceImpl.java @@ -1,5 +1,6 @@ package com.zdxt.enforcementcode.service.impl; +import com.zdxt.enforcementcode.domain.Xzjcjbxx025711; import com.zdxt.enforcementcode.domain.bo.Xzjcjbxx025711Bo; import com.zdxt.enforcementcode.domain.vo.Xzjcjbxx025711Vo; import org.dromara.common.core.utils.MapstructUtils; @@ -184,4 +185,18 @@ public class SxtJcdzb107522ServiceImpl implements ISxtJcdzb107522Service { List list = baseMapper.selectXzjcHistoryList(bo, page); return TableDataInfo.build(list); } + + /** + * 一期 + * @param xzjcjboxx + * @return + */ + @Override + public TableDataInfo queryByEnterpriseNumber(Xzjcjbxx025711 xzjcjboxx,PageQuery pageQuery) { + Page page = pageQuery.build(); + List list = baseMapper.queryByEnterpriseNumber(xzjcjboxx,page); + return TableDataInfo.build(list); + } + + } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/SxtJcdzb107522Mapper.xml b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/SxtJcdzb107522Mapper.xml index ed4112da..7ccf4c41 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/SxtJcdzb107522Mapper.xml +++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/SxtJcdzb107522Mapper.xml @@ -18,4 +18,22 @@ a.c601034 = #{bo.c601034} order by b.C601005 desc + + + + From c810789f3939d541b75a3d8e84e90b4094c4856e Mon Sep 17 00:00:00 2001 From: vincent Date: Thu, 13 Aug 2026 09:16:46 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=89=A7=E6=B3=95=E7=AB=AF=E4=BC=81?= =?UTF-8?q?=E4=B8=9A=E6=9F=A5=E8=AF=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/enforcementcode/EnterpriseInformationMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnterpriseInformationMapper.xml b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnterpriseInformationMapper.xml index ea4a1b18..40f271ca 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnterpriseInformationMapper.xml +++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnterpriseInformationMapper.xml @@ -79,7 +79,7 @@ qr_code_url, generate_time FROM qr_code_generate_history - WHERE `status` = 0 ORDER BY generate_time DESC LIMIT 1 ) t + WHERE `status` = 0 ORDER BY generate_time DESC) t GROUP BY t.enterprise_number,t.qr_code_url,t.generate_time ) gh ON ei.enterprise_number = gh.enterprise_number From 0cde1ea34c58dfc9178e606ed4868f2965fb0660 Mon Sep 17 00:00:00 2001 From: niujiyi <18272501226@163.com> Date: Thu, 13 Aug 2026 09:22:21 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=9B=91=E7=9D=A3=E7=AB=AF-=E5=AF=8C?= =?UTF-8?q?=E6=96=87=E6=9C=AC=E4=B8=8D=E8=BF=87=E6=BB=A4=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev.yml b/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev.yml index f0f055da..96f6034e 100644 --- a/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev.yml +++ b/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev.yml @@ -4,10 +4,9 @@ zdxt: upload-path: D:\zfjdm\uploadPath # upload-path: /usr/local/uploadPath # upload-path: /Users/vincent/uploadPath - url-prefix: /profile - qr_code_url: /usr/local/uploads/zfjd_logo.png - demo_enabled: false - +# url-prefix: /profile + # qr_code_url: /usr/local/uploads/zfjd_logo.png + # demo_enabled: false --- # 监控中心配置 spring.boot.admin.client: # 增加客户端开关 @@ -110,14 +109,14 @@ spring.data: redis: # 地址 # host: 139.186.148.21 - host: 127.0.0.1 + host: 172.16.20.72 # 端口，默认为6379 port: 6379 # 数据库索引 database: 0 # redis 密码必须配置 # password: zdxt@123 - # password: + password: # 连接超时时间 timeout: 10s # 是否开启ssl @@ -355,6 +354,8 @@ xss: excludeUrls: - /web/enforcementcode/educationServices/add - /web/enforcementcode/educationServices/edit + - /web/supervision/carouselBanner/add + - /web/supervision/carouselBanner/edit --- # 业务数据双向同步配置 business-data-sync: