diff --git a/ncac/package/cacdb.sql b/ncac/package/cacdb.sql
index d4ebc1e..1030225 100644
--- a/ncac/package/cacdb.sql
+++ b/ncac/package/cacdb.sql
@@ -1,6 +1,6 @@
 -- MySQL dump 10.13  Distrib 8.0.34, for Win64 (x86_64)
 --
--- Host: 192.168.50.81    Database: cacdb
+-- Host: 192.168.50.83    Database: cacdb
 -- ------------------------------------------------------
 -- Server version	5.7.44
 
@@ -458,24 +458,11 @@ DROP TABLE IF EXISTS `data_eia_h`;
 CREATE TABLE `data_eia_h` (
   `eqmid` int(11) NOT NULL,
   `d_time` datetime NOT NULL,
-  `d_pt_1` float DEFAULT '0' COMMENT 'A相母线电压',
-  `d_pt_2` float DEFAULT '0' COMMENT 'B相母线电压',
-  `d_pt_3` float DEFAULT '0' COMMENT 'C相母线电压',
-  `d_pt_4` float DEFAULT '0',
-  `d_ct_1` float DEFAULT NULL COMMENT 'A相泄露电流',
-  `d_ct_2` float DEFAULT '0' COMMENT 'B相泄露电流',
-  `d_ct_3` float DEFAULT '0' COMMENT 'C相泄露电流',
-  `d_ct_4` float DEFAULT '0',
+  `d_pt` float DEFAULT '0' COMMENT '母线电压',
+  `d_ct` float DEFAULT NULL COMMENT '泄露电流',
   `d_hz` float DEFAULT '0' COMMENT '频率',
-  `d_pf_1` float DEFAULT '0' COMMENT 'A相电容量',
-  `d_pf_2` float DEFAULT '0' COMMENT 'B相电容量',
-  `d_pf_3` float DEFAULT '0' COMMENT 'C相电容量',
-  `d_pf_4` float DEFAULT '0',
-  `d_jx_1` float DEFAULT '0' COMMENT 'A相介质损耗因数',
-  `d_jx_2` float DEFAULT '0' COMMENT 'B相介质损耗因数',
-  `d_jx_3` float DEFAULT '0' COMMENT 'C相介质损耗因数',
-  `d_jx_4` float DEFAULT '0',
-  `isupload` int(11) DEFAULT NULL,
+  `d_pf` float DEFAULT '0' COMMENT '电容量',
+  `d_jx` float DEFAULT '0' COMMENT '介质损耗因数',
   PRIMARY KEY (`eqmid`,`d_time`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='绝缘监测历史数据';
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -690,108 +677,161 @@ LOCK TABLES `data_epa_statistics` WRITE;
 UNLOCK TABLES;
 
 --
--- Table structure for table `data_etp_h`
+-- Table structure for table `data_etp_h6`
 --
 
-DROP TABLE IF EXISTS `data_etp_h`;
+DROP TABLE IF EXISTS `data_etp_h6`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!50503 SET character_set_client = utf8mb4 */;
-CREATE TABLE `data_etp_h` (
+CREATE TABLE `data_etp_h6` (
   `eqmid` int(11) NOT NULL,
   `d_time` datetime NOT NULL,
-  `t1` float(18,3) DEFAULT NULL COMMENT 'A相上触头/1通道温度',
-  `t2` float(18,3) DEFAULT NULL COMMENT 'B相上触头/2通道温度',
-  `t3` float(18,3) DEFAULT NULL COMMENT 'C相上触头/3通道温度',
-  `t4` float(18,3) DEFAULT NULL COMMENT 'A相下触头/4通道温度',
-  `t5` float(18,3) DEFAULT NULL COMMENT 'B相下触头/5通道温度',
-  `t6` float(18,3) DEFAULT NULL COMMENT 'C相下触头/6通道温度',
-  `t7` float(18,3) DEFAULT NULL COMMENT '1闸刀A相触头/7通道温度',
-  `t8` float(18,3) DEFAULT NULL COMMENT '1闸刀B相触头/8通道温度',
-  `t9` float(18,3) DEFAULT NULL COMMENT '1闸刀C相触头/9通道温度',
-  `t10` float(18,3) DEFAULT NULL COMMENT '3闸刀A相触头/10通道温度',
-  `t11` float(18,3) DEFAULT NULL COMMENT '3闸刀B相触头/11通道温度',
-  `t12` float(18,3) DEFAULT NULL COMMENT '3闸刀C相触头/12通道温度',
-  `t13` float(18,3) DEFAULT NULL COMMENT '13通道温度',
-  `t14` float(18,3) DEFAULT NULL COMMENT '14通道温度',
-  `t15` float(18,3) DEFAULT NULL COMMENT '15通道温度',
-  `t16` float(18,3) DEFAULT NULL COMMENT '16通道温度',
+  `t1` decimal(18,4) DEFAULT NULL,
+  `t2` decimal(18,4) DEFAULT NULL,
+  `t3` decimal(18,4) DEFAULT NULL,
+  `t4` decimal(18,4) DEFAULT NULL,
+  `t5` decimal(18,4) DEFAULT NULL,
+  `t6` decimal(18,4) DEFAULT NULL,
   `s1` int(11) DEFAULT NULL,
   `s2` int(11) DEFAULT NULL,
   `s3` int(11) DEFAULT NULL,
   `s4` int(11) DEFAULT NULL,
   `s5` int(11) DEFAULT NULL,
   `s6` int(11) DEFAULT NULL,
-  `s7` int(11) DEFAULT NULL,
-  `s8` int(11) DEFAULT NULL,
-  `s9` int(11) DEFAULT NULL,
-  `s10` int(11) DEFAULT NULL,
-  `s11` int(11) DEFAULT NULL,
-  `s12` int(11) DEFAULT NULL,
   `state1` tinyint(4) DEFAULT NULL,
   `state2` tinyint(4) DEFAULT NULL,
   `state3` tinyint(4) DEFAULT NULL,
   `state4` tinyint(4) DEFAULT NULL,
   `state5` tinyint(4) DEFAULT NULL,
   `state6` tinyint(4) DEFAULT NULL,
-  `state7` tinyint(4) DEFAULT NULL,
-  `state8` tinyint(4) DEFAULT NULL,
-  `state9` tinyint(4) DEFAULT NULL,
-  `state10` tinyint(4) DEFAULT NULL,
-  `state11` tinyint(4) DEFAULT NULL,
-  `state12` tinyint(4) DEFAULT NULL,
-  `isupload` int(1) DEFAULT '0',
   PRIMARY KEY (`eqmid`,`d_time`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
--- Dumping data for table `data_etp_h`
+-- Dumping data for table `data_etp_h6`
 --
 
-LOCK TABLES `data_etp_h` WRITE;
-/*!40000 ALTER TABLE `data_etp_h` DISABLE KEYS */;
-/*!40000 ALTER TABLE `data_etp_h` ENABLE KEYS */;
+LOCK TABLES `data_etp_h6` WRITE;
+/*!40000 ALTER TABLE `data_etp_h6` DISABLE KEYS */;
+/*!40000 ALTER TABLE `data_etp_h6` ENABLE KEYS */;
 UNLOCK TABLES;
 
 --
--- Table structure for table `data_etp_h6`
+-- Table structure for table `data_etpdl_h`
 --
 
-DROP TABLE IF EXISTS `data_etp_h6`;
+DROP TABLE IF EXISTS `data_etpdl_h`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!50503 SET character_set_client = utf8mb4 */;
-CREATE TABLE `data_etp_h6` (
+CREATE TABLE `data_etpdl_h` (
   `eqmid` int(11) NOT NULL,
   `d_time` datetime NOT NULL,
-  `t1` decimal(18,4) DEFAULT NULL,
-  `t2` decimal(18,4) DEFAULT NULL,
-  `t3` decimal(18,4) DEFAULT NULL,
-  `t4` decimal(18,4) DEFAULT NULL,
-  `t5` decimal(18,4) DEFAULT NULL,
-  `t6` decimal(18,4) DEFAULT NULL,
-  `s1` int(11) DEFAULT NULL,
-  `s2` int(11) DEFAULT NULL,
-  `s3` int(11) DEFAULT NULL,
-  `s4` int(11) DEFAULT NULL,
-  `s5` int(11) DEFAULT NULL,
-  `s6` int(11) DEFAULT NULL,
-  `state1` tinyint(4) DEFAULT NULL,
-  `state2` tinyint(4) DEFAULT NULL,
-  `state3` tinyint(4) DEFAULT NULL,
-  `state4` tinyint(4) DEFAULT NULL,
-  `state5` tinyint(4) DEFAULT NULL,
-  `state6` tinyint(4) DEFAULT NULL,
+  `t1` float(18,3) DEFAULT NULL COMMENT '1通道温度',
+  `t2` float(18,3) DEFAULT NULL COMMENT '2通道温度',
+  `t3` float(18,3) DEFAULT NULL COMMENT '3通道温度',
+  `t4` float(18,3) DEFAULT NULL COMMENT '4通道温度',
+  `t5` float(18,3) DEFAULT NULL COMMENT '5通道温度',
+  `t6` float(18,3) DEFAULT NULL COMMENT '6通道温度',
+  `t7` float(18,3) DEFAULT NULL COMMENT '7通道温度',
+  `t8` float(18,3) DEFAULT NULL COMMENT '8通道温度',
+  `t9` float(18,3) DEFAULT NULL COMMENT '9通道温度',
+  `t10` float(18,3) DEFAULT NULL COMMENT '10通道温度',
+  `t11` float(18,3) DEFAULT NULL COMMENT '11通道温度',
+  `t12` float(18,3) DEFAULT NULL COMMENT '12通道温度',
+  `t13` float(18,3) DEFAULT NULL COMMENT '13通道温度',
+  `t14` float(18,3) DEFAULT NULL COMMENT '14通道温度',
+  `t15` float(18,3) DEFAULT NULL COMMENT '15通道温度',
+  `t16` float(18,3) DEFAULT NULL COMMENT '16通道温度',
   PRIMARY KEY (`eqmid`,`d_time`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='电缆测温';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
--- Dumping data for table `data_etp_h6`
+-- Dumping data for table `data_etpdl_h`
 --
 
-LOCK TABLES `data_etp_h6` WRITE;
-/*!40000 ALTER TABLE `data_etp_h6` DISABLE KEYS */;
-/*!40000 ALTER TABLE `data_etp_h6` ENABLE KEYS */;
+LOCK TABLES `data_etpdl_h` WRITE;
+/*!40000 ALTER TABLE `data_etpdl_h` DISABLE KEYS */;
+/*!40000 ALTER TABLE `data_etpdl_h` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `data_etprz_h`
+--
+
+DROP TABLE IF EXISTS `data_etprz_h`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `data_etprz_h` (
+  `eqmid` int(11) NOT NULL,
+  `d_time` datetime NOT NULL,
+  `t1` float(18,3) DEFAULT NULL COMMENT '1通道温度',
+  `t2` float(18,3) DEFAULT NULL COMMENT '2通道温度',
+  `t3` float(18,3) DEFAULT NULL COMMENT '3通道温度',
+  `t4` float(18,3) DEFAULT NULL COMMENT '4通道温度',
+  `t5` float(18,3) DEFAULT NULL COMMENT '5通道温度',
+  `t6` float(18,3) DEFAULT NULL COMMENT '6通道温度',
+  `t7` float(18,3) DEFAULT NULL COMMENT '7通道温度',
+  `t8` float(18,3) DEFAULT NULL COMMENT '8通道温度',
+  `t9` float(18,3) DEFAULT NULL COMMENT '9通道温度',
+  `t10` float(18,3) DEFAULT NULL COMMENT '10通道温度',
+  `t11` float(18,3) DEFAULT NULL COMMENT '11通道温度',
+  `t12` float(18,3) DEFAULT NULL COMMENT '12通道温度',
+  `t13` float(18,3) DEFAULT NULL COMMENT '13通道温度',
+  `t14` float(18,3) DEFAULT NULL COMMENT '14通道温度',
+  `t15` float(18,3) DEFAULT NULL COMMENT '15通道温度',
+  `t16` float(18,3) DEFAULT NULL COMMENT '16通道温度',
+  PRIMARY KEY (`eqmid`,`d_time`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='绕组测温';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `data_etprz_h`
+--
+
+LOCK TABLES `data_etprz_h` WRITE;
+/*!40000 ALTER TABLE `data_etprz_h` DISABLE KEYS */;
+/*!40000 ALTER TABLE `data_etprz_h` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `data_etpwx_h`
+--
+
+DROP TABLE IF EXISTS `data_etpwx_h`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `data_etpwx_h` (
+  `eqmid` int(11) NOT NULL,
+  `d_time` datetime NOT NULL,
+  `t1` float(18,3) DEFAULT NULL COMMENT '1通道温度',
+  `t2` float(18,3) DEFAULT NULL COMMENT '2通道温度',
+  `t3` float(18,3) DEFAULT NULL COMMENT '3通道温度',
+  `t4` float(18,3) DEFAULT NULL COMMENT '4通道温度',
+  `t5` float(18,3) DEFAULT NULL COMMENT '5通道温度',
+  `t6` float(18,3) DEFAULT NULL COMMENT '6通道温度',
+  `t7` float(18,3) DEFAULT NULL COMMENT '7通道温度',
+  `t8` float(18,3) DEFAULT NULL COMMENT '8通道温度',
+  `t9` float(18,3) DEFAULT NULL COMMENT '9通道温度',
+  `t10` float(18,3) DEFAULT NULL COMMENT '10通道温度',
+  `t11` float(18,3) DEFAULT NULL COMMENT '11通道温度',
+  `t12` float(18,3) DEFAULT NULL COMMENT '12通道温度',
+  `t13` float(18,3) DEFAULT NULL COMMENT '13通道温度',
+  `t14` float(18,3) DEFAULT NULL COMMENT '14通道温度',
+  `t15` float(18,3) DEFAULT NULL COMMENT '15通道温度',
+  `t16` float(18,3) DEFAULT NULL COMMENT '16通道温度',
+  PRIMARY KEY (`eqmid`,`d_time`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='无线测温';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `data_etpwx_h`
+--
+
+LOCK TABLES `data_etpwx_h` WRITE;
+/*!40000 ALTER TABLE `data_etpwx_h` DISABLE KEYS */;
+/*!40000 ALTER TABLE `data_etpwx_h` ENABLE KEYS */;
 UNLOCK TABLES;
 
 --
@@ -907,39 +947,6 @@ LOCK TABLES `data_jdw_h` WRITE;
 /*!40000 ALTER TABLE `data_jdw_h` ENABLE KEYS */;
 UNLOCK TABLES;
 
---
--- Table structure for table `data_jsyhw_jyjc`
---
-
-DROP TABLE IF EXISTS `data_jsyhw_jyjc`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!50503 SET character_set_client = utf8mb4 */;
-CREATE TABLE `data_jsyhw_jyjc` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `eqmid` int(11) DEFAULT NULL COMMENT '设备id',
-  `acquisitionTime` datetime DEFAULT NULL COMMENT '监测时间',
-  `systemVoltage` float DEFAULT NULL COMMENT '系统电压',
-  `totalCurrent` float DEFAULT NULL COMMENT '全电流',
-  `resistiveCurrent` float DEFAULT NULL COMMENT '阻性电流',
-  `actionCount` float DEFAULT NULL COMMENT '计数器动作次数',
-  `lastActionTime` datetime DEFAULT NULL COMMENT '最后一次动作时间',
-  `isupload` int(11) DEFAULT NULL,
-  `create_time` timestamp NULL DEFAULT NULL COMMENT '创建时间',
-  `update_time` timestamp NULL DEFAULT NULL COMMENT '修改时间',
-  PRIMARY KEY (`id`),
-  KEY `idx` (`eqmid`,`acquisitionTime`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='金属氧化物绝缘监测';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `data_jsyhw_jyjc`
---
-
-LOCK TABLES `data_jsyhw_jyjc` WRITE;
-/*!40000 ALTER TABLE `data_jsyhw_jyjc` DISABLE KEYS */;
-/*!40000 ALTER TABLE `data_jsyhw_jyjc` ENABLE KEYS */;
-UNLOCK TABLES;
-
 --
 -- Table structure for table `data_leakagecurrent_h`
 --
@@ -1075,34 +1082,15 @@ DROP TABLE IF EXISTS `data_moa_h`;
 CREATE TABLE `data_moa_h` (
   `eqmid` int(11) NOT NULL,
   `d_time` datetime NOT NULL,
-  `pt1` float DEFAULT NULL COMMENT 'A相系统电压',
-  `lc1` float DEFAULT NULL COMMENT 'A相全电流',
-  `rc1` float DEFAULT NULL COMMENT 'A相阻性电流',
-  `pt2` float DEFAULT NULL COMMENT 'B相系统电压',
-  `lc2` float DEFAULT NULL COMMENT 'B相全电流',
-  `rc2` float DEFAULT NULL COMMENT 'B相阻性电流',
-  `pt3` float DEFAULT NULL COMMENT 'C相系统电压',
-  `lc3` float DEFAULT NULL COMMENT 'C相全电流',
-  `rc3` float DEFAULT NULL COMMENT 'C相阻性电流',
-  `isupload` int(11) DEFAULT NULL,
-  `lastligtm1` datetime DEFAULT NULL COMMENT 'A相最近落雷时间',
-  `ligcnt1` int(11) DEFAULT '0' COMMENT 'A相累计落雷次数',
-  `cacur1` float DEFAULT NULL COMMENT 'A相容性电流',
-  `riscarte1` float DEFAULT NULL COMMENT 'A相阻容比',
-  `modevconf1` int(1) DEFAULT NULL COMMENT 'A相IED与监测设备通讯异常',
-  `supdevrun1` int(1) DEFAULT NULL COMMENT 'A相设备运行异常',
-  `lastligtm2` datetime DEFAULT NULL COMMENT 'B相最近落雷时间',
-  `ligcnt2` int(11) DEFAULT '0' COMMENT 'B相累计落雷次数',
-  `cacur2` float DEFAULT NULL COMMENT 'B相容性电流',
-  `riscarte2` float DEFAULT NULL COMMENT 'B相阻容比',
-  `modevconf2` int(1) DEFAULT NULL COMMENT 'B相IED与监测设备通讯异常',
-  `supdevrun2` int(1) DEFAULT NULL COMMENT 'B相设备运行异常',
-  `lastligtm3` datetime DEFAULT NULL COMMENT 'C相最近落雷时间',
-  `ligcnt3` int(11) DEFAULT '0' COMMENT 'C相累计落雷次数',
-  `cacur3` float DEFAULT NULL COMMENT 'C相容性电流',
-  `riscarte3` float DEFAULT NULL COMMENT 'C相阻容比',
-  `modevconf3` int(1) DEFAULT NULL COMMENT 'C相IED与监测设备通讯异常',
-  `supdevrun3` int(1) DEFAULT NULL COMMENT 'C相设备运行异常',
+  `pt` float DEFAULT NULL COMMENT '系统电压',
+  `lc` float DEFAULT NULL COMMENT '全电流',
+  `rc` float DEFAULT NULL COMMENT '阻性电流',
+  `lastligtm` datetime DEFAULT NULL COMMENT '最近落雷时间',
+  `ligcnt` int(11) DEFAULT '0' COMMENT '累计落雷次数',
+  `cacur` float DEFAULT NULL COMMENT '容性电流',
+  `riscarte` float DEFAULT NULL COMMENT '阻容比',
+  `modevconf` int(1) DEFAULT NULL COMMENT 'IED与监测设备通讯异常',
+  `supdevrun` int(1) DEFAULT NULL COMMENT '设备运行异常',
   PRIMARY KEY (`eqmid`,`d_time`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -1238,12 +1226,11 @@ CREATE TABLE `data_pd_h` (
   `plsnum` int(11) DEFAULT NULL COMMENT '脉冲个数',
   `padschtype` varchar(50) DEFAULT NULL COMMENT '局放类型',
   `acupadsch` float DEFAULT NULL COMMENT '局放声学水平',
-  `apppadsch` float DEFAULT NULL COMMENT '视在局放放电量，峰值',
+  `apppadsch` float DEFAULT NULL COMMENT '局放峰值',
   `nqs` float DEFAULT NULL COMMENT '平均放电电流',
   `uhfpadsch` float DEFAULT NULL COMMENT '局放UHF水平',
   `phase` float DEFAULT NULL COMMENT '放电相位',
   `waveform` longtext,
-  `isupload` int(11) DEFAULT NULL,
   PRIMARY KEY (`eqmid`,`d_time`) USING BTREE
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='局部放电数据表';
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -1304,7 +1291,6 @@ CREATE TABLE `data_scur_h` (
   `d_time` datetime NOT NULL COMMENT '创建时间',
   `alarm_level` int(10) DEFAULT NULL COMMENT '报警等级',
   `current_val` varchar(20) DEFAULT NULL COMMENT '电流值（mA）',
-  `isupload` int(5) DEFAULT NULL COMMENT '状态（1：已经发送，0：未发送）',
   PRIMARY KEY (`eqmid`,`d_time`) USING BTREE
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='电缆环流数据表';
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -1355,22 +1341,12 @@ DROP TABLE IF EXISTS `data_sf6_h`;
 CREATE TABLE `data_sf6_h` (
   `eqmid` int(11) NOT NULL,
   `d_time` datetime NOT NULL,
-  `temp1` float(12,3) DEFAULT NULL COMMENT 'A相温度',
-  `pressure1` float(12,3) DEFAULT NULL COMMENT 'A相压力',
-  `md1` float(12,3) DEFAULT NULL COMMENT 'A相密度',
-  `pm1` float(12,3) DEFAULT NULL COMMENT 'A相微水',
-  `ddt1` float(12,3) DEFAULT NULL COMMENT 'A相露点',
-  `temp2` float(12,3) DEFAULT NULL COMMENT 'B相温度',
-  `pressure2` float(12,3) DEFAULT NULL COMMENT 'B相压力',
-  `md2` float(12,3) DEFAULT NULL COMMENT 'B相密度',
-  `pm2` float(12,3) DEFAULT NULL COMMENT 'B相微水',
-  `ddt2` float(12,3) DEFAULT NULL COMMENT 'B相露点',
-  `temp3` float(12,3) DEFAULT NULL COMMENT 'C相温度',
-  `pressure3` float(12,3) DEFAULT NULL COMMENT 'C相压力',
-  `md3` float(12,3) DEFAULT NULL COMMENT 'C相密度',
-  `pm3` float(12,3) DEFAULT NULL COMMENT 'C相微水',
-  `ddt3` float(12,3) DEFAULT NULL COMMENT 'C相露点',
-  `isupload` int(11) DEFAULT NULL,
+  `temp` float(12,3) DEFAULT NULL COMMENT '温度',
+  `pressure` float(12,3) DEFAULT NULL COMMENT '压力',
+  `md` float(12,3) DEFAULT NULL COMMENT '密度',
+  `pm` float(12,3) DEFAULT NULL COMMENT '微水',
+  `ddt` float(12,3) DEFAULT NULL COMMENT '露点',
+  `pressure20` float(12,3) DEFAULT NULL COMMENT '压力',
   PRIMARY KEY (`eqmid`,`d_time`) USING BTREE
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -1384,68 +1360,6 @@ LOCK TABLES `data_sf6_h` WRITE;
 /*!40000 ALTER TABLE `data_sf6_h` ENABLE KEYS */;
 UNLOCK TABLES;
 
---
--- Table structure for table `data_sf6_qtsf`
---
-
-DROP TABLE IF EXISTS `data_sf6_qtsf`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!50503 SET character_set_client = utf8mb4 */;
-CREATE TABLE `data_sf6_qtsf` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `eqmid` int(11) DEFAULT NULL COMMENT '设备id',
-  `acquisitionTime` datetime DEFAULT NULL COMMENT '监测时间',
-  `temperature` float DEFAULT NULL COMMENT '温度',
-  `moisture` float DEFAULT NULL COMMENT '水分',
-  `isupload` int(11) DEFAULT NULL,
-  `create_time` timestamp NULL DEFAULT NULL COMMENT '创建时间',
-  `update_time` timestamp NULL DEFAULT NULL COMMENT '修改时间',
-  PRIMARY KEY (`id`),
-  KEY `idx` (`eqmid`,`acquisitionTime`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='SF6 气体水分';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `data_sf6_qtsf`
---
-
-LOCK TABLES `data_sf6_qtsf` WRITE;
-/*!40000 ALTER TABLE `data_sf6_qtsf` DISABLE KEYS */;
-/*!40000 ALTER TABLE `data_sf6_qtsf` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `data_sf6_qtyl`
---
-
-DROP TABLE IF EXISTS `data_sf6_qtyl`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!50503 SET character_set_client = utf8mb4 */;
-CREATE TABLE `data_sf6_qtyl` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `eqmid` int(11) DEFAULT NULL COMMENT '设备id',
-  `acquisitionTime` datetime DEFAULT NULL COMMENT '监测时间',
-  `temperature` float DEFAULT NULL COMMENT '温度',
-  `absolutePressure` float DEFAULT NULL COMMENT '绝对压力',
-  `density` float DEFAULT NULL COMMENT '密度',
-  `pressure20C` float DEFAULT NULL COMMENT '压力（20℃）',
-  `isupload` int(11) DEFAULT NULL,
-  `create_time` timestamp NULL DEFAULT NULL COMMENT '创建时间',
-  `update_time` timestamp NULL DEFAULT NULL COMMENT '修改时间',
-  PRIMARY KEY (`id`),
-  KEY `idx2` (`eqmid`,`acquisitionTime`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='SF6 气体压力';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `data_sf6_qtyl`
---
-
-LOCK TABLES `data_sf6_qtyl` WRITE;
-/*!40000 ALTER TABLE `data_sf6_qtyl` DISABLE KEYS */;
-/*!40000 ALTER TABLE `data_sf6_qtyl` ENABLE KEYS */;
-UNLOCK TABLES;
-
 --
 -- Table structure for table `data_sf6_statistics`
 --
@@ -1496,31 +1410,14 @@ DROP TABLE IF EXISTS `data_sf6env_h`;
 CREATE TABLE `data_sf6env_h` (
   `eqmid` int(11) NOT NULL,
   `d_time` datetime NOT NULL,
-  `gas1` float(12,3) DEFAULT NULL COMMENT 'SF6浓度A相',
-  `yq1` float(12,3) DEFAULT NULL COMMENT 'O2含量A相',
-  `md1` float(12,3) DEFAULT NULL COMMENT '温度A相',
-  `pm1` float(12,3) DEFAULT NULL COMMENT '湿度A相',
-  `sf6warn1` float(12,3) DEFAULT NULL COMMENT 'SF6浓度报警阈值A相',
-  `o2warn1` float(12,3) DEFAULT NULL COMMENT 'O2报警阈值A相',
-  `gascnt1` int(12) DEFAULT NULL COMMENT '双气传感器数量A相',
-  `hmcnt1` int(12) DEFAULT NULL COMMENT '温湿度传感器数量A相',
-  `gas2` float(12,3) DEFAULT NULL COMMENT 'SF6浓度B相',
-  `yq2` float(12,3) DEFAULT NULL COMMENT 'O2含量B相',
-  `md2` float(12,3) DEFAULT NULL COMMENT '温度B相',
-  `pm2` float(12,3) DEFAULT NULL COMMENT '湿度B相',
-  `sf6warn2` float(12,3) DEFAULT NULL COMMENT 'SF6浓度报警阈值B相',
-  `o2warn2` float(12,3) DEFAULT NULL COMMENT 'O2报警阈值B相',
-  `gascnt2` int(12) DEFAULT NULL COMMENT '双气传感器数量B相',
-  `hmcnt2` int(12) DEFAULT NULL COMMENT '温湿度传感器数量B相',
-  `gas3` float(12,3) DEFAULT NULL COMMENT 'SF6浓度C相',
-  `yq3` float(12,3) DEFAULT NULL COMMENT 'O2含量C相',
-  `md3` float(12,3) DEFAULT NULL COMMENT '温度C相',
-  `pm3` float(12,3) DEFAULT NULL COMMENT '湿度C相',
-  `sf6warn3` float(12,3) DEFAULT NULL COMMENT 'SF6浓度报警阈值C相',
-  `o2warn3` float(12,3) DEFAULT NULL COMMENT 'O2报警阈值C相',
-  `gascnt3` int(12) DEFAULT NULL COMMENT '双气传感器数量C相',
-  `hmcnt3` int(12) DEFAULT NULL COMMENT '温湿度传感器数量C相',
-  `isupload` int(11) DEFAULT NULL,
+  `gas` float(12,3) DEFAULT NULL COMMENT 'SF6浓度',
+  `yq` float(12,3) DEFAULT NULL COMMENT 'O2含量',
+  `tmp` float(12,3) DEFAULT NULL COMMENT '温度',
+  `pm` float(12,3) DEFAULT NULL COMMENT '湿度',
+  `sf6warn` float(12,3) DEFAULT NULL COMMENT 'SF6浓度报警阈值',
+  `o2warn` float(12,3) DEFAULT NULL COMMENT 'O2报警阈值',
+  `gascnt` int(12) DEFAULT NULL COMMENT '双气传感器数量',
+  `hmcnt` int(12) DEFAULT NULL COMMENT '温湿度传感器数量',
   PRIMARY KEY (`eqmid`,`d_time`) USING BTREE
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -1608,35 +1505,6 @@ LOCK TABLES `data_th_h` WRITE;
 /*!40000 ALTER TABLE `data_th_h` ENABLE KEYS */;
 UNLOCK TABLES;
 
---
--- Table structure for table `data_tx`
---
-
-DROP TABLE IF EXISTS `data_tx`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!50503 SET character_set_client = utf8mb4 */;
-CREATE TABLE `data_tx` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `eqmid` int(11) DEFAULT NULL COMMENT '设备id',
-  `acquisitionTime` datetime DEFAULT NULL COMMENT '监测时间',
-  `totalCoreCurrent` float DEFAULT NULL COMMENT '铁芯全电流',
-  `isupload` int(11) DEFAULT NULL,
-  `create_time` timestamp NULL DEFAULT NULL COMMENT '创建时间',
-  `update_time` timestamp NULL DEFAULT NULL COMMENT '修改时间',
-  PRIMARY KEY (`id`),
-  KEY `idx` (`eqmid`,`acquisitionTime`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='铁芯';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `data_tx`
---
-
-LOCK TABLES `data_tx` WRITE;
-/*!40000 ALTER TABLE `data_tx` DISABLE KEYS */;
-/*!40000 ALTER TABLE `data_tx` ENABLE KEYS */;
-UNLOCK TABLES;
-
 --
 -- Table structure for table `data_video_h`
 --
@@ -1690,44 +1558,6 @@ LOCK TABLES `data_ws` WRITE;
 /*!40000 ALTER TABLE `data_ws` ENABLE KEYS */;
 UNLOCK TABLES;
 
---
--- Table structure for table `data_ysp`
---
-
-DROP TABLE IF EXISTS `data_ysp`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!50503 SET character_set_client = utf8mb4 */;
-CREATE TABLE `data_ysp` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `eqmid` int(11) DEFAULT NULL COMMENT '设备id',
-  `acquisitionTime` datetime DEFAULT NULL COMMENT '监测时间',
-  `H2` float DEFAULT NULL COMMENT '氢气',
-  `CH4` float DEFAULT NULL COMMENT '甲烷',
-  `C2H6` float DEFAULT NULL COMMENT '乙烷',
-  `C2H4` float DEFAULT NULL COMMENT '乙烯',
-  `C2H2` float DEFAULT NULL COMMENT '乙炔',
-  `CO` float DEFAULT NULL COMMENT '一氧化碳',
-  `CO2` float DEFAULT NULL COMMENT '二氧化碳',
-  `O2` float DEFAULT NULL COMMENT '氧气',
-  `N2` float DEFAULT NULL COMMENT '氮气',
-  `TotalHydrocarbon` float DEFAULT NULL COMMENT '总烃',
-  `isupload` int(11) DEFAULT NULL,
-  `create_time` timestamp NULL DEFAULT NULL COMMENT '创建时间',
-  `update_time` timestamp NULL DEFAULT NULL COMMENT '修改时间',
-  PRIMARY KEY (`id`),
-  KEY `idx` (`eqmid`,`acquisitionTime`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='油色谱';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `data_ysp`
---
-
-LOCK TABLES `data_ysp` WRITE;
-/*!40000 ALTER TABLE `data_ysp` DISABLE KEYS */;
-/*!40000 ALTER TABLE `data_ysp` ENABLE KEYS */;
-UNLOCK TABLES;
-
 --
 -- Table structure for table `i2relation`
 --
@@ -2240,7 +2070,7 @@ CREATE TABLE `modevtype` (
   `type_code` varchar(45) DEFAULT NULL COMMENT '类型编码',
   `intervals` int(11) DEFAULT NULL COMMENT '采集间隔/分钟',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE=MyISAM AUTO_INCREMENT=77 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='监测设备类型表';
+) ENGINE=MyISAM AUTO_INCREMENT=78 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='监测设备类型表';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -2250,45 +2080,29 @@ CREATE TABLE `modevtype` (
 LOCK TABLES `modevtype` WRITE;
 /*!40000 ALTER TABLE `modevtype` DISABLE KEYS */;
 INSERT INTO `modevtype` VALUES (1,'油色谱','data_epa_h','021002',30);
-INSERT INTO `modevtype` VALUES (2,'铁芯','data_eia_h','',30);
-INSERT INTO `modevtype` VALUES (4,'避雷器','data_moa_h',NULL,30);
-INSERT INTO `modevtype` VALUES (5,'测温柜','data_etp_h','026002',30);
+INSERT INTO `modevtype` VALUES (2,'铁芯','data_eia_h','021004',30);
+INSERT INTO `modevtype` VALUES (3,'夹件','data_eia_h',NULL,30);
+INSERT INTO `modevtype` VALUES (4,'避雷器','data_moa_h','023001',30);
 INSERT INTO `modevtype` VALUES (6,'温湿度','data_th_h',NULL,30);
 INSERT INTO `modevtype` VALUES (7,'空气质量','data_aq_h',NULL,30);
-INSERT INTO `modevtype` VALUES (8,'SF6','data_sf6_h',NULL,30);
-INSERT INTO `modevtype` VALUES (9,'红外温度A相','data_eaif_h',NULL,30);
-INSERT INTO `modevtype` VALUES (10,'局部放电A相','data_pd_h',NULL,30);
+INSERT INTO `modevtype` VALUES (8,'SF6','data_sf6_h','024004',30);
+INSERT INTO `modevtype` VALUES (9,'红外温度','data_eaif_h',NULL,30);
+INSERT INTO `modevtype` VALUES (10,'GIS局部放电','data_pd_h','024001',30);
 INSERT INTO `modevtype` VALUES (11,'油温油压','data_otp_h',NULL,30);
 INSERT INTO `modevtype` VALUES (12,'视频','data_video_h',NULL,30);
 INSERT INTO `modevtype` VALUES (13,'流变','data_eia_h',NULL,30);
 INSERT INTO `modevtype` VALUES (14,'压变','data_eia_h',NULL,30);
 INSERT INTO `modevtype` VALUES (15,'套管','data_eia_h',NULL,30);
 INSERT INTO `modevtype` VALUES (16,'微气象','data_microclimate_h',NULL,30);
+INSERT INTO `modevtype` VALUES (17,'无线测温','data_etpwx_h','026002',30);
+INSERT INTO `modevtype` VALUES (18,'电缆测温','data_etpdl_h','028006',30);
+INSERT INTO `modevtype` VALUES (19,'绕组测温','data_etprz_h','021013',30);
+INSERT INTO `modevtype` VALUES (20,'电缆环流','data_scur_h',NULL,30);
 INSERT INTO `modevtype` VALUES (21,'电缆沟','data_dlg_h',NULL,30);
-INSERT INTO `modevtype` VALUES (3,'夹件','data_eia_h',NULL,30);
-INSERT INTO `modevtype` VALUES (25,'局部放电B相','data_pd_h',NULL,30);
-INSERT INTO `modevtype` VALUES (26,'局部放电C相','data_pd_h',NULL,30);
-INSERT INTO `modevtype` VALUES (27,'电缆环流A2相','data_scur_h',NULL,30);
-INSERT INTO `modevtype` VALUES (28,'电缆环流A3相','data_scur_h',NULL,30);
-INSERT INTO `modevtype` VALUES (29,'电缆环流B1相','data_scur_h',NULL,30);
-INSERT INTO `modevtype` VALUES (30,'电缆环流B2相','data_scur_h',NULL,30);
-INSERT INTO `modevtype` VALUES (31,'电缆环流B3相','data_scur_h',NULL,30);
-INSERT INTO `modevtype` VALUES (32,'电缆环流C1相','data_scur_h',NULL,30);
-INSERT INTO `modevtype` VALUES (33,'电缆环流C2相','data_scur_h',NULL,30);
-INSERT INTO `modevtype` VALUES (34,'电缆环流C3相','data_scur_h',NULL,30);
-INSERT INTO `modevtype` VALUES (35,'红外温度B相','data_eaif_h',NULL,30);
-INSERT INTO `modevtype` VALUES (36,'红外温度C相','data_eaif_h',NULL,30);
 INSERT INTO `modevtype` VALUES (40,'接地网','data_jdw_h',NULL,30);
-INSERT INTO `modevtype` VALUES (59,'电缆测温','data_etp_h','028006',30);
-INSERT INTO `modevtype` VALUES (20,'电缆环流A1相','data_scur_h',NULL,30);
-INSERT INTO `modevtype` VALUES (61,'SF6环境','data_sf6env_h',NULL,30);
-INSERT INTO `modevtype` VALUES (68,'变压器局部放电','data_byq_jbfd','021001',30);
-INSERT INTO `modevtype` VALUES (63,'金属氧化物绝缘监测','data_jsyhw_jyjc','023001',30);
-INSERT INTO `modevtype` VALUES (64,'SF6气体压力','data_sf6_qtyl','024004',30);
+INSERT INTO `modevtype` VALUES (61,'SF6环境','data_sf6env_h','024009',30);
 INSERT INTO `modevtype` VALUES (65,'断路器局部放电','data_dlq_jbfd','024001',30);
-INSERT INTO `modevtype` VALUES (66,'变压器铁芯','data_tx','021004',30);
-INSERT INTO `modevtype` VALUES (67,'变压器油色谱','data_ysp','021002',30);
-INSERT INTO `modevtype` VALUES (69,'SF6气体水分','data_sf6_qtsf','024005',30);
+INSERT INTO `modevtype` VALUES (68,'变压器局部放电','data_byq_jbfd','021001',30);
 INSERT INTO `modevtype` VALUES (70,'变压器顶层油温','data_dcyw','021005',30);
 INSERT INTO `modevtype` VALUES (71,'负荷电流波形','data_fhdlbx','024003',30);
 INSERT INTO `modevtype` VALUES (72,'分合闸线圈','data_fhzxq','024002',30);
@@ -2313,7 +2127,7 @@ CREATE TABLE `modevtype_point` (
   `field_desc` varchar(200) DEFAULT NULL COMMENT '对应tablename表的字段名称描述',
   `type` varchar(45) DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=86 DEFAULT CHARSET=utf8mb4 COMMENT='监测设备类型属性点表';
+) ENGINE=InnoDB AUTO_INCREMENT=137 DEFAULT CHARSET=utf8mb4 COMMENT='监测设备类型属性点表';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -2322,13 +2136,6 @@ CREATE TABLE `modevtype_point` (
 
 LOCK TABLES `modevtype_point` WRITE;
 /*!40000 ALTER TABLE `modevtype_point` DISABLE KEYS */;
-INSERT INTO `modevtype_point` VALUES (1,10,'nqs','平均放电电流','float');
-INSERT INTO `modevtype_point` VALUES (2,10,'apppadsch','视在局放放电量，峰值','float');
-INSERT INTO `modevtype_point` VALUES (3,25,'nqs','平均放电电流','float');
-INSERT INTO `modevtype_point` VALUES (4,25,'apppadsch','视在局放放电量，峰值','float');
-INSERT INTO `modevtype_point` VALUES (5,26,'nqs','平均放电电流','float');
-INSERT INTO `modevtype_point` VALUES (6,26,'apppadsch','视在局放放电量，峰值','float');
-INSERT INTO `modevtype_point` VALUES (8,2,'d_ct_1','泄露电流','float');
 INSERT INTO `modevtype_point` VALUES (9,3,'d_ct_1','泄露电流','float');
 INSERT INTO `modevtype_point` VALUES (10,1,'ch4ppm','甲烷含量','float');
 INSERT INTO `modevtype_point` VALUES (11,1,'c2h4ppm','乙烯含量','float');
@@ -2337,52 +2144,12 @@ INSERT INTO `modevtype_point` VALUES (13,1,'c2h2ppm','乙炔含量','float');
 INSERT INTO `modevtype_point` VALUES (14,1,'h2ppm','氢气含量','float');
 INSERT INTO `modevtype_point` VALUES (15,1,'coppm','一氧化碳含量','float');
 INSERT INTO `modevtype_point` VALUES (16,1,'co2ppm','二氧化碳含量','float');
-INSERT INTO `modevtype_point` VALUES (17,1,'h2oppm','微水含量','float');
 INSERT INTO `modevtype_point` VALUES (18,1,'totalhydrocarbon','总烃','float');
-INSERT INTO `modevtype_point` VALUES (19,4,'lc1','A相全电流','float');
-INSERT INTO `modevtype_point` VALUES (20,4,'ligcnt1','A相累计落雷次数','float');
-INSERT INTO `modevtype_point` VALUES (21,4,'lc2','B相全电流','float');
-INSERT INTO `modevtype_point` VALUES (22,4,'ligcnt2','B相累计落雷次数','float');
-INSERT INTO `modevtype_point` VALUES (23,4,'lc3','C相全电流','float');
-INSERT INTO `modevtype_point` VALUES (24,4,'ligcnt3','C相累计落雷次数','float');
 INSERT INTO `modevtype_point` VALUES (25,20,'current_val','环流数据','float');
-INSERT INTO `modevtype_point` VALUES (26,27,'current_val','环流数据','float');
-INSERT INTO `modevtype_point` VALUES (27,28,'current_val','环流数据','float');
-INSERT INTO `modevtype_point` VALUES (28,29,'current_val','环流数据','float');
-INSERT INTO `modevtype_point` VALUES (29,30,'current_val','环流数据','float');
-INSERT INTO `modevtype_point` VALUES (30,31,'current_val','环流数据','float');
-INSERT INTO `modevtype_point` VALUES (31,32,'current_val','环流数据','float');
-INSERT INTO `modevtype_point` VALUES (32,33,'current_val','环流数据','float');
-INSERT INTO `modevtype_point` VALUES (33,34,'current_val','环流数据','float');
-INSERT INTO `modevtype_point` VALUES (34,8,'temp1','A相温度','float');
-INSERT INTO `modevtype_point` VALUES (35,8,'pressure1','A相压力','float');
-INSERT INTO `modevtype_point` VALUES (36,8,'md1','A相密度','float');
-INSERT INTO `modevtype_point` VALUES (37,8,'temp2','B相温度','float');
-INSERT INTO `modevtype_point` VALUES (38,8,'pressure2','B相压力','float');
-INSERT INTO `modevtype_point` VALUES (39,8,'md2','B相密度','float');
-INSERT INTO `modevtype_point` VALUES (40,8,'temp3','C相温度','float');
-INSERT INTO `modevtype_point` VALUES (41,8,'pressure3','C相压力','float');
-INSERT INTO `modevtype_point` VALUES (42,8,'md3','C相密度','float');
-INSERT INTO `modevtype_point` VALUES (44,64,'density','密度','float');
-INSERT INTO `modevtype_point` VALUES (45,64,'pressure20C','压力（20℃）','float');
-INSERT INTO `modevtype_point` VALUES (46,64,'temperature','温度','float');
-INSERT INTO `modevtype_point` VALUES (47,63,'actionCount','计数器动作次数','float');
-INSERT INTO `modevtype_point` VALUES (48,63,'totalCurrent','全电流','float');
 INSERT INTO `modevtype_point` VALUES (49,65,'dischargeCapacity','放电量','float');
 INSERT INTO `modevtype_point` VALUES (50,65,'dischargeWaveform','放电波形','float');
 INSERT INTO `modevtype_point` VALUES (51,65,'pulseCount','脉冲个数','float');
 INSERT INTO `modevtype_point` VALUES (52,65,'phase','相位','float');
-INSERT INTO `modevtype_point` VALUES (53,66,'totalCoreCurrent','铁芯全电流','float');
-INSERT INTO `modevtype_point` VALUES (54,67,'C2H2','乙炔','float');
-INSERT INTO `modevtype_point` VALUES (55,67,'C2H4','乙烯','float');
-INSERT INTO `modevtype_point` VALUES (56,67,'C2H6','乙烷','float');
-INSERT INTO `modevtype_point` VALUES (57,67,'CH4','甲烷','float');
-INSERT INTO `modevtype_point` VALUES (58,67,'CO','一氧化碳','float');
-INSERT INTO `modevtype_point` VALUES (59,67,'CO2','二氧化碳','float');
-INSERT INTO `modevtype_point` VALUES (60,67,'H2','氢气','float');
-INSERT INTO `modevtype_point` VALUES (61,67,'N2','氮气','float');
-INSERT INTO `modevtype_point` VALUES (62,67,'O2','氧气','float');
-INSERT INTO `modevtype_point` VALUES (63,67,'TotalHydrocarbon','总烃','float');
 INSERT INTO `modevtype_point` VALUES (64,74,'capacitance','电容量','float');
 INSERT INTO `modevtype_point` VALUES (65,74,'lossFactor','介质损耗因数','float');
 INSERT INTO `modevtype_point` VALUES (66,74,'systemVoltage','系统电压','float');
@@ -2390,21 +2157,59 @@ INSERT INTO `modevtype_point` VALUES (67,74,'totalCurrent','全电流','float');
 INSERT INTO `modevtype_point` VALUES (68,74,'unbalanceCurrent','三相不平衡电流','float');
 INSERT INTO `modevtype_point` VALUES (69,74,'unbalanceVoltage','三相不平衡电压','float');
 INSERT INTO `modevtype_point` VALUES (70,76,'chargeTime','储能时间','float');
-INSERT INTO `modevtype_point` VALUES (71,5,'t1','A相1通道','float');
-INSERT INTO `modevtype_point` VALUES (72,5,'t2','B相2通道','float');
-INSERT INTO `modevtype_point` VALUES (73,5,'t3','C相3通道','float');
-INSERT INTO `modevtype_point` VALUES (74,5,'t4','A相4通道','float');
-INSERT INTO `modevtype_point` VALUES (75,5,'t5','B相5通道','float');
-INSERT INTO `modevtype_point` VALUES (76,5,'t6','C相6通道','float');
-INSERT INTO `modevtype_point` VALUES (77,5,'t7','A相7通道','float');
-INSERT INTO `modevtype_point` VALUES (78,5,'t8','B相8通道','float');
-INSERT INTO `modevtype_point` VALUES (79,5,'t9','C相9通道','float');
-INSERT INTO `modevtype_point` VALUES (80,59,'t1','A相','float');
-INSERT INTO `modevtype_point` VALUES (81,59,'t2','B相','float');
-INSERT INTO `modevtype_point` VALUES (82,59,'t3','C相','float');
 INSERT INTO `modevtype_point` VALUES (83,68,'dischargeCapacity','放电量','float');
 INSERT INTO `modevtype_point` VALUES (84,68,'dischargePosition','放电位置','float');
 INSERT INTO `modevtype_point` VALUES (85,68,'pulseCount','脉冲个数','float');
+INSERT INTO `modevtype_point` VALUES (86,1,'mstppm','微水含量','float');
+INSERT INTO `modevtype_point` VALUES (87,2,'d_ct','泄露电流','float');
+INSERT INTO `modevtype_point` VALUES (88,4,'lc','全电流','float');
+INSERT INTO `modevtype_point` VALUES (89,4,'rc','阻性电流','float');
+INSERT INTO `modevtype_point` VALUES (90,4,'ligcnt','累计落雷次数','int');
+INSERT INTO `modevtype_point` VALUES (91,17,'t1','1通道温度','float');
+INSERT INTO `modevtype_point` VALUES (92,17,'t2','2通道温度','float');
+INSERT INTO `modevtype_point` VALUES (93,17,'t3','3通道温度','float');
+INSERT INTO `modevtype_point` VALUES (94,17,'t4','4通道温度','float');
+INSERT INTO `modevtype_point` VALUES (95,17,'t5','5通道温度','float');
+INSERT INTO `modevtype_point` VALUES (96,17,'t6','6通道温度','float');
+INSERT INTO `modevtype_point` VALUES (97,17,'t7','7通道温度','float');
+INSERT INTO `modevtype_point` VALUES (98,17,'t8','8通道温度','float');
+INSERT INTO `modevtype_point` VALUES (99,17,'t9','9通道温度','float');
+INSERT INTO `modevtype_point` VALUES (100,18,'t1','1通道温度','float');
+INSERT INTO `modevtype_point` VALUES (101,18,'t2','2通道温度','float');
+INSERT INTO `modevtype_point` VALUES (102,18,'t3','3通道温度','float');
+INSERT INTO `modevtype_point` VALUES (103,18,'t4','4通道温度','float');
+INSERT INTO `modevtype_point` VALUES (104,18,'t5','5通道温度','float');
+INSERT INTO `modevtype_point` VALUES (105,18,'t6','6通道温度','float');
+INSERT INTO `modevtype_point` VALUES (106,18,'t7','7通道温度','float');
+INSERT INTO `modevtype_point` VALUES (107,18,'t8','8通道温度','float');
+INSERT INTO `modevtype_point` VALUES (108,18,'t9','9通道温度','float');
+INSERT INTO `modevtype_point` VALUES (109,19,'t1','1通道温度','float');
+INSERT INTO `modevtype_point` VALUES (110,19,'t2','2通道温度','float');
+INSERT INTO `modevtype_point` VALUES (111,19,'t3','3通道温度','float');
+INSERT INTO `modevtype_point` VALUES (112,19,'t4','4通道温度','float');
+INSERT INTO `modevtype_point` VALUES (113,19,'t5','5通道温度','float');
+INSERT INTO `modevtype_point` VALUES (114,19,'t6','6通道温度','float');
+INSERT INTO `modevtype_point` VALUES (115,19,'t7','7通道温度','float');
+INSERT INTO `modevtype_point` VALUES (116,19,'t8','8通道温度','float');
+INSERT INTO `modevtype_point` VALUES (117,19,'t9','9通道温度','float');
+INSERT INTO `modevtype_point` VALUES (118,6,'envhum','湿度','float');
+INSERT INTO `modevtype_point` VALUES (119,6,'envtmp','温度','float');
+INSERT INTO `modevtype_point` VALUES (120,7,'envhum','湿度','float');
+INSERT INTO `modevtype_point` VALUES (121,7,'envtmp','温度','float');
+INSERT INTO `modevtype_point` VALUES (122,7,'airquality','空气质量','float');
+INSERT INTO `modevtype_point` VALUES (123,8,'temp','温度','float');
+INSERT INTO `modevtype_point` VALUES (124,8,'pressure','压力','float');
+INSERT INTO `modevtype_point` VALUES (125,8,'md','密度','float');
+INSERT INTO `modevtype_point` VALUES (126,8,'pressure20','相对压力','float');
+INSERT INTO `modevtype_point` VALUES (127,10,'apppadsch','局放峰值','float');
+INSERT INTO `modevtype_point` VALUES (128,10,'phase','放电相位','float');
+INSERT INTO `modevtype_point` VALUES (129,10,'nqs','平均放电电流','float');
+INSERT INTO `modevtype_point` VALUES (130,10,'opcnt','动作计数器','int');
+INSERT INTO `modevtype_point` VALUES (131,20,'alarm_level','报警等级','int');
+INSERT INTO `modevtype_point` VALUES (132,61,'gas','SF6浓度','float');
+INSERT INTO `modevtype_point` VALUES (133,61,'yq','O2含量','float');
+INSERT INTO `modevtype_point` VALUES (135,61,'pm','湿度','float');
+INSERT INTO `modevtype_point` VALUES (136,61,'tmp','温度','float');
 /*!40000 ALTER TABLE `modevtype_point` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -2618,7 +2423,7 @@ CREATE TABLE `unit` (
   `field` varchar(45) DEFAULT NULL COMMENT '字段名',
   `unit` varchar(45) DEFAULT NULL COMMENT '单位',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=42 DEFAULT CHARSET=utf8mb4 COMMENT='计量单位';
+) ENGINE=InnoDB AUTO_INCREMENT=62 DEFAULT CHARSET=utf8mb4 COMMENT='计量单位';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -2629,21 +2434,12 @@ LOCK TABLES `unit` WRITE;
 /*!40000 ALTER TABLE `unit` DISABLE KEYS */;
 INSERT INTO `unit` VALUES (5,'Density','Kg/m3');
 INSERT INTO `unit` VALUES (6,'Temperature','°C');
-INSERT INTO `unit` VALUES (7,'Pressure20C','MPa');
-INSERT INTO `unit` VALUES (8,'H2','UL/L');
-INSERT INTO `unit` VALUES (9,'CH4','UL/L');
-INSERT INTO `unit` VALUES (10,'C2H6','UL/L');
-INSERT INTO `unit` VALUES (11,'C2H4','UL/L');
-INSERT INTO `unit` VALUES (12,'C2H2','UL/L');
-INSERT INTO `unit` VALUES (13,'CO','UL/L');
-INSERT INTO `unit` VALUES (14,'CO2','UL/L');
-INSERT INTO `unit` VALUES (15,'O2','UL/L');
-INSERT INTO `unit` VALUES (16,'N2','UL/L');
+INSERT INTO `unit` VALUES (7,'Pressure20','MPa');
 INSERT INTO `unit` VALUES (17,'totalhydrocarbon','UL/L');
 INSERT INTO `unit` VALUES (18,'MaxTmp','°C');
 INSERT INTO `unit` VALUES (19,'MinTmp','°C');
 INSERT INTO `unit` VALUES (20,'AvgTmp','°C');
-INSERT INTO `unit` VALUES (21,'AbsolutePressure','MPa');
+INSERT INTO `unit` VALUES (21,'pressure','MPa');
 INSERT INTO `unit` VALUES (22,'Moisture','u L/L');
 INSERT INTO `unit` VALUES (23,'FullCurrent','mA');
 INSERT INTO `unit` VALUES (24,'CableCurrent','A');
@@ -2661,9 +2457,28 @@ INSERT INTO `unit` VALUES (35,'c2h2ppm','UL/L');
 INSERT INTO `unit` VALUES (36,'h2ppm','UL/L');
 INSERT INTO `unit` VALUES (37,'coppm','UL/L');
 INSERT INTO `unit` VALUES (38,'co2ppm','UL/L');
-INSERT INTO `unit` VALUES (39,'h2oppm','UL/L');
 INSERT INTO `unit` VALUES (40,'totalCoreCurrent','mA');
 INSERT INTO `unit` VALUES (41,'chargeTime','s');
+INSERT INTO `unit` VALUES (42,'mstppm','UL/L');
+INSERT INTO `unit` VALUES (43,'lc','mA');
+INSERT INTO `unit` VALUES (44,'rc','mA');
+INSERT INTO `unit` VALUES (45,'t1','°C');
+INSERT INTO `unit` VALUES (46,'t2','°C');
+INSERT INTO `unit` VALUES (47,'t3','°C');
+INSERT INTO `unit` VALUES (48,'t4','°C');
+INSERT INTO `unit` VALUES (49,'t5','°C');
+INSERT INTO `unit` VALUES (50,'t6','°C');
+INSERT INTO `unit` VALUES (51,'t7','°C');
+INSERT INTO `unit` VALUES (52,'t8','°C');
+INSERT INTO `unit` VALUES (53,'t9','°C');
+INSERT INTO `unit` VALUES (54,'t10','°C');
+INSERT INTO `unit` VALUES (55,'t11','°C');
+INSERT INTO `unit` VALUES (56,'t12','°C');
+INSERT INTO `unit` VALUES (57,'envtmp','°C');
+INSERT INTO `unit` VALUES (58,'envhum','%RH‌');
+INSERT INTO `unit` VALUES (59,'temp','°C');
+INSERT INTO `unit` VALUES (60,'md','Kg/m3');
+INSERT INTO `unit` VALUES (61,'current_val','mA');
 /*!40000 ALTER TABLE `unit` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -2886,4 +2701,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2024-12-10 10:35:38
+-- Dump completed on 2024-12-16 12:01:10