From a554b8e0b4445dc5a5103ad675382375bde1e644 Mon Sep 17 00:00:00 2001 From: niujiyi <18272501226@163.com> Date: Thu, 24 Sep 2026 15:10:39 +0800 Subject: [PATCH] =?UTF-8?q?cim-=E6=80=81=E5=8A=BF=E6=84=9F=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- script/sql/zfjd-refactoring-v1/其他/njy/2026-1.10.0.sql | 8 +++----- .../DashboardSituationTrendAreaController.java | 2 +- .../DashboardSituationTrendDomainController.java | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/script/sql/zfjd-refactoring-v1/其他/njy/2026-1.10.0.sql b/script/sql/zfjd-refactoring-v1/其他/njy/2026-1.10.0.sql index 9dbf8833..d5a201eb 100644 --- a/script/sql/zfjd-refactoring-v1/其他/njy/2026-1.10.0.sql +++ b/script/sql/zfjd-refactoring-v1/其他/njy/2026-1.10.0.sql @@ -8,7 +8,7 @@ CREATE TABLE `dashboard_overview_ent` ( `district_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '区名称', `street_code` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '街道编号', `street_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '街道名称', - `level` tinyint NOT NULL COMMENT '级别：1-市 2-区 3-街道', + `level` tinyint NULL COMMENT '级别：1-市 2-区 3-街道', `bureau_dept_id` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '执法单位ID', `bureau_dept_name` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '执法单位名称', `dept_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '部门ID', @@ -31,7 +31,6 @@ CREATE TABLE `dashboard_overview_ent` ( KEY `idx_is_delete` (`is_delete`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='大屏总览统计-企业数量表'; - CREATE TABLE `dashboard_overview_unit` ( `id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '主键ID', `city_code` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '市编码', @@ -40,7 +39,7 @@ CREATE TABLE `dashboard_overview_unit` ( `district_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '区名称', `street_code` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '街道编号', `street_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '街道名称', - `level` tinyint NOT NULL COMMENT '级别：1-市 2-区 3-街道', + `level` tinyint NULL COMMENT '级别：1-市 2-区 3-街道', `bureau_dept_id` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '执法单位ID', `bureau_dept_name` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '执法单位名称', `dept_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '部门ID', @@ -63,7 +62,6 @@ CREATE TABLE `dashboard_overview_unit` ( KEY `idx_is_delete` (`is_delete`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='大屏总览统计-执法单位数表'; - CREATE TABLE `dashboard_overview_personnel` ( `id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '主键ID', `city_code` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '市编码', @@ -72,7 +70,7 @@ CREATE TABLE `dashboard_overview_personnel` ( `district_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '区名称', `street_code` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '街道编号', `street_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '街道名称', - `level` tinyint NOT NULL COMMENT '级别：1-市 2-区 3-街道', + `level` tinyint NULL COMMENT '级别：1-市 2-区 3-街道', `bureau_dept_id` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '执法单位ID', `bureau_dept_name` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '执法单位名称', `dept_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '部门ID', diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/DashboardSituationTrendAreaController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/DashboardSituationTrendAreaController.java index e5568074..113695a8 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/DashboardSituationTrendAreaController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/DashboardSituationTrendAreaController.java @@ -22,7 +22,7 @@ import com.zdxt.enforcementcode.service.IDashboardSituationTrendAreaService; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/enforcementcode/situationTrendArea") +@RequestMapping("/external/api/enforcementcode/situationTrendArea") public class DashboardSituationTrendAreaController extends BaseController { private final IDashboardSituationTrendAreaService dashboardSituationTrendAreaService; diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/DashboardSituationTrendDomainController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/DashboardSituationTrendDomainController.java index 2b49fad0..98076ee7 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/DashboardSituationTrendDomainController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/DashboardSituationTrendDomainController.java @@ -22,7 +22,7 @@ import com.zdxt.enforcementcode.service.IDashboardSituationTrendDomainService; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/web/dashboard/situationTrendDomain") +@RequestMapping("/external/api/web/dashboard/situationTrendDomain") public class DashboardSituationTrendDomainController extends BaseController { private final IDashboardSituationTrendDomainService situationTrendDomainService;