From ac6b7730dae43e5c394168f641d7dadff082ad69 Mon Sep 17 00:00:00 2001
From: hxh <762326930@qq.com>
Date: Mon, 18 Mar 2024 10:43:51 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E9=A2=84=E8=AE=A1=E8=AF=95=E5=9B=BEsql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sql/sy/v1.2.0/全量脚本/v1.2.0-all.sql    | 12 ++++++++++++
 sql/sy/v1.2.0/增量脚本/v1.2.0-update.sql | 11 ++++++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/sql/sy/v1.2.0/全量脚本/v1.2.0-all.sql b/sql/sy/v1.2.0/全量脚本/v1.2.0-all.sql
index 692f3a38..5a6b6204 100644
--- a/sql/sy/v1.2.0/全量脚本/v1.2.0-all.sql
+++ b/sql/sy/v1.2.0/全量脚本/v1.2.0-all.sql
@@ -417,6 +417,7 @@ CREATE TABLE `bs_sgc_df_dtsbr` (
     `WARNING_LEVEL` varchar(32) DEFAULT NULL COMMENT '预警等级',
     `WARNING_TIME` datetime DEFAULT NULL COMMENT '预警时间',
     `WARNING_DATA` varchar(100) COLLATE utf8mb4_general_ci COMMENT '预警数据',
+    `STATUS` int DEFAULT 0 NOT NULL COMMENT '状态',
     `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人',
     `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间',
     `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人',
@@ -750,6 +751,7 @@ CREATE TABLE `bs_sgc_sz_dtsbr` (
     `WARNING_LEVEL` varchar(32) DEFAULT NULL COMMENT '预警等级',
     `WARNING_TIME` datetime DEFAULT NULL COMMENT '预警时间',
     `WARNING_DATA` varchar(100) COLLATE utf8mb4_general_ci COMMENT '预警数据',
+    `STATUS` int DEFAULT 0 NOT NULL COMMENT '状态',
     `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人',
     `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间',
     `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人',
@@ -788,3 +790,13 @@ CREATE TABLE `bs_sgc_sz_czjl` (
     `OPERATOR_TIME` datetime DEFAULT NULL COMMENT '操作时间',
     PRIMARY KEY (`ID`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='水闸操作记录表';
+
+
+CREATE OR REPLACE VIEW `v_bs_sgc_dtsbr` AS
+SELECT df.`DIKE_CODE` AS `CODE`,gc.`DIKE_NAME` AS `NAME`,'1' AS `TYPE`,df.`STATUS` AS `STATUS`,gc.`ADCD` AS ADCD, df.`WARNING_TYPE` AS `WARNING_TYPE`, df.`WARNING_LEVEL` AS `WARNING_LEVEL`, df.`WARNING_TIME` AS `WARNING_TIME`
+FROM `bs_sgc_df_dtsbr` AS df
+LEFT JOIN `bs_sgc_df_gcda` AS gc ON df.`DIKE_CODE` = gc.`DIKE_CODE` AND gc.`EXPR_DATE` is null
+union all
+SELECT sz.`WAGA_CODE` AS `CODE`,jb.`WAGA_NAME` AS `NAME`,'2' AS `TYPE`,sz.`STATUS` AS `STATUS`,jb.`ADCD` AS ADCD, sz.`WARNING_TYPE` AS `WARNING_TYPE`, sz.`WARNING_LEVEL` AS `WARNING_LEVEL`, sz.`WARNING_TIME` AS `WARNING_TIME`
+FROM `bs_sgc_sz_dtsbr` AS sz
+LEFT JOIN `bs_sgc_sz_jbxx` AS jb ON sz.`WAGA_CODE` = jb.`WAGA_CODE` and jb.`EXPR_DATE` is null
\ No newline at end of file
diff --git a/sql/sy/v1.2.0/增量脚本/v1.2.0-update.sql b/sql/sy/v1.2.0/增量脚本/v1.2.0-update.sql
index 3bd9f585..c4a7ac47 100644
--- a/sql/sy/v1.2.0/增量脚本/v1.2.0-update.sql
+++ b/sql/sy/v1.2.0/增量脚本/v1.2.0-update.sql
@@ -326,6 +326,7 @@ CREATE TABLE `bs_sgc_sz_dtsbr` (
     `WARNING_LEVEL` varchar(32) DEFAULT NULL COMMENT '预警等级',
     `WARNING_TIME` datetime DEFAULT NULL COMMENT '预警时间',
     `WARNING_DATA` varchar(100) COLLATE utf8mb4_general_ci COMMENT '预警数据',
+    `STATUS` int DEFAULT 0 NOT NULL COMMENT '状态',
     `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人',
     `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间',
     `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人',
@@ -359,6 +360,7 @@ CREATE TABLE `bs_sgc_df_dtsbr` (
     `WARNING_LEVEL` varchar(32) DEFAULT NULL COMMENT '预警等级',
     `WARNING_TIME` datetime DEFAULT NULL COMMENT '预警时间',
     `WARNING_DATA` varchar(100) COLLATE utf8mb4_general_ci COMMENT '预警数据',
+    `STATUS` int DEFAULT 0 NOT NULL COMMENT '状态',
     `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人',
     `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间',
     `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人',
@@ -399,5 +401,12 @@ CREATE TABLE `bs_sgc_sz_czjl` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='水闸操作记录表';
 
 
-
+CREATE OR REPLACE VIEW `v_bs_sgc_dtsbr` AS
+SELECT df.`DIKE_CODE` AS `CODE`,gc.`DIKE_NAME` AS `NAME`,'1' AS `TYPE`,df.`STATUS` AS `STATUS`,gc.`ADCD` AS ADCD, df.`WARNING_TYPE` AS `WARNING_TYPE`, df.`WARNING_LEVEL` AS `WARNING_LEVEL`, df.`WARNING_TIME` AS `WARNING_TIME`
+FROM `bs_sgc_df_dtsbr` AS df
+LEFT JOIN `bs_sgc_df_gcda` AS gc ON df.`DIKE_CODE` = gc.`DIKE_CODE` AND gc.`EXPR_DATE` is null
+union all
+SELECT sz.`WAGA_CODE` AS `CODE`,jb.`WAGA_NAME` AS `NAME`,'2' AS `TYPE`,sz.`STATUS` AS `STATUS`,jb.`ADCD` AS ADCD, sz.`WARNING_TYPE` AS `WARNING_TYPE`, sz.`WARNING_LEVEL` AS `WARNING_LEVEL`, sz.`WARNING_TIME` AS `WARNING_TIME`
+FROM `bs_sgc_sz_dtsbr` AS sz
+LEFT JOIN `bs_sgc_sz_jbxx` AS jb ON sz.`WAGA_CODE` = jb.`WAGA_CODE` and jb.`EXPR_DATE` is null