From ca29172c335250d22394d8e6463060f7e04ed9fb Mon Sep 17 00:00:00 2001
From: huangfeng <huangfeng@xinyingpower.com>
Date: Fri, 20 Jun 2025 09:46:01 +0800
Subject: [PATCH] =?UTF-8?q?db:=20=E8=B0=83=E6=95=B4=E8=A1=A8=E7=BB=93?=
 =?UTF-8?q?=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/upgrade20250501.sql                         |  8 --------
 db/upgrade20250616.sql                         | 13 +++++++++++++
 src/main/java/com/xydl/cac/entity/NSensor.java |  8 ++++++++
 3 files changed, 21 insertions(+), 8 deletions(-)
 delete mode 100644 db/upgrade20250501.sql

diff --git a/db/upgrade20250501.sql b/db/upgrade20250501.sql
deleted file mode 100644
index 5eb6c69..0000000
--- a/db/upgrade20250501.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-ALTER TABLE `ied_dl_config`
-ADD COLUMN `upload` INT NULL COMMENT '0:不传; 1:要传;' AFTER `active`;
-
-ALTER TABLE `ied_dl_record`
-ADD COLUMN `upload` INT(11) NULL DEFAULT NULL COMMENT '0:未传; 1:已传;' AFTER `data`;
-
-ALTER TABLE `i2sync_field`
-ADD COLUMN `conversion` VARCHAR(45) NULL COMMENT '单位换算' AFTER `attach`;
diff --git a/db/upgrade20250616.sql b/db/upgrade20250616.sql
index da8301f..5493a77 100644
--- a/db/upgrade20250616.sql
+++ b/db/upgrade20250616.sql
@@ -7,3 +7,16 @@ CREATE TABLE `iec_104_point` (
   `create_time` datetime DEFAULT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+ALTER TABLE `ied_dl_config`
+ADD COLUMN `upload` INT NULL COMMENT '0:不传; 1:要传;' AFTER `active`;
+
+ALTER TABLE `ied_dl_record`
+ADD COLUMN `upload` INT(11) NULL DEFAULT NULL COMMENT '0:未传; 1:已传;' AFTER `data`;
+
+ALTER TABLE `i2sync_field`
+ADD COLUMN `conversion` VARCHAR(45) NULL COMMENT '单位换算' AFTER `attach`;
+
+ALTER TABLE `n_sensor`
+ADD COLUMN `sdk_type` INT NULL COMMENT '1:大华 2:海康' AFTER `tm_type`,
+ADD COLUMN `channel` INT NULL COMMENT '通道' AFTER `sdk_type`;
diff --git a/src/main/java/com/xydl/cac/entity/NSensor.java b/src/main/java/com/xydl/cac/entity/NSensor.java
index 8bf4acc..aa2eda0 100644
--- a/src/main/java/com/xydl/cac/entity/NSensor.java
+++ b/src/main/java/com/xydl/cac/entity/NSensor.java
@@ -93,6 +93,14 @@ public class NSensor {
     @ApiModelProperty("tmType")
     private Integer tmType;
 
+    @Column(name = "sdk_type")
+    @ApiModelProperty("1:大华 2:海康")
+    private Integer sdkType;
+
+    @Column(name = "channel")
+    @ApiModelProperty("通道")
+    private Integer channel;
+
     @ApiModelProperty("主设备名称")
     @Transient
     private String zsbName;