From 77781a8ef9b3e0249495a7cb29eb9059d81b3c2a Mon Sep 17 00:00:00 2001 From: wangshilong Date: Thu, 12 Dec 2024 14:30:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=8F=8C=E6=99=9F=E5=8A=A8?= =?UTF-8?q?=E4=BD=9C=E5=89=A9=E4=BD=99=E6=97=B6=E9=97=B4=E7=82=B9=E8=A1=A8?= =?UTF-8?q?=E8=A7=A3=E6=9E=90=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gaswellwatch/modbus/data/impl/EtcPersistenceHandler.java | 1 + .../gaswellwatch/modbus/data/impl/ScssPersistenceHandler.java | 2 +- src/main/resources/sql/CREATE_SCSS.sql | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/isu/gaswellwatch/modbus/data/impl/EtcPersistenceHandler.java b/src/main/java/com/isu/gaswellwatch/modbus/data/impl/EtcPersistenceHandler.java index a68c4a3..d0acb38 100644 --- a/src/main/java/com/isu/gaswellwatch/modbus/data/impl/EtcPersistenceHandler.java +++ b/src/main/java/com/isu/gaswellwatch/modbus/data/impl/EtcPersistenceHandler.java @@ -28,6 +28,7 @@ public class EtcPersistenceHandler extends AbstractPersistenceHandler { ETC_COLUMN_MAPPING_MAP.put("current_status_start_time", "currentStatusStartTime"); ETC_COLUMN_MAPPING_MAP.put("cas_pressure", "casPressure"); ETC_COLUMN_MAPPING_MAP.put("oil_pressure", "oilPressure"); + ETC_COLUMN_MAPPING_MAP.put("pre_pressure", "prePressure"); ETC_COLUMN_MAPPING_MAP.put("plunger_rise_time", "plungerRiseTime"); ETC_COLUMN_MAPPING_MAP.put("arrival_sensor_delay_time", "arrivalSensorDelayTime"); ETC_COLUMN_MAPPING_MAP.put("well_shut_in_time", "wellShutInTime"); diff --git a/src/main/java/com/isu/gaswellwatch/modbus/data/impl/ScssPersistenceHandler.java b/src/main/java/com/isu/gaswellwatch/modbus/data/impl/ScssPersistenceHandler.java index 221aca5..79fee62 100644 --- a/src/main/java/com/isu/gaswellwatch/modbus/data/impl/ScssPersistenceHandler.java +++ b/src/main/java/com/isu/gaswellwatch/modbus/data/impl/ScssPersistenceHandler.java @@ -130,7 +130,7 @@ public class ScssPersistenceHandler extends AbstractPersistenceHandler { ScssPersistenceHandler.this.setValue(ps, newRow, 7, "firstSolenoidStatus", Types.INTEGER); ScssPersistenceHandler.this.setValue(ps, newRow, 8, "batteryVoltage", Types.DECIMAL); ScssPersistenceHandler.this.setValue(ps, newRow, 9, "solarVoltage", Types.DECIMAL); - ScssPersistenceHandler.this.setValue(ps, newRow, 10, "remainingTimeAction", Types.INTEGER); + ScssPersistenceHandler.this.setValue(ps, newRow, 10, "remainingTimeAction", Types.VARCHAR); ScssPersistenceHandler.this.setValue(ps, newRow, 11, "secondSolenoidStatus", Types.INTEGER); ScssPersistenceHandler.this.setValue(ps, newRow, 12, "prePressure", Types.INTEGER); ScssPersistenceHandler.this.setValue(ps, newRow, 13, "internetTraffic", Types.INTEGER); diff --git a/src/main/resources/sql/CREATE_SCSS.sql b/src/main/resources/sql/CREATE_SCSS.sql index bb4a0db..f52266d 100644 --- a/src/main/resources/sql/CREATE_SCSS.sql +++ b/src/main/resources/sql/CREATE_SCSS.sql @@ -10,7 +10,7 @@ CREATE TABLE `$TableName$` `first_solenoid_status` int NULL DEFAULT NULL COMMENT '当前第一个电磁阀状态', `battery_voltage` decimal(10, 1) NULL DEFAULT NULL COMMENT '电池电压', `solar_voltage` decimal(10, 1) NULL DEFAULT NULL COMMENT '太阳能电压', - `remaining_time_action` int NULL DEFAULT NULL COMMENT '动作剩余时间', + `remaining_time_action` varchar(10) NULL DEFAULT NULL COMMENT '动作剩余时间，秒数，需要转为小时+分钟', `second_solenoid_status` int NULL DEFAULT NULL COMMENT '第二个电磁阀状态', `pre_pressure` int NULL DEFAULT NULL COMMENT '输压', `internet_traffic` int NULL DEFAULT NULL COMMENT '流量',