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 375646a..77ddc01 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 @@ -45,7 +45,7 @@ public class ScssPersistenceHandler extends AbstractPersistenceHandler { ScssPersistenceHandler.this.setValue(ps, newRow, 9, "solarVoltage", Types.DECIMAL); ScssPersistenceHandler.this.setValue(ps, newRow, 10, "remainingTimeAction", Types.INTEGER); ScssPersistenceHandler.this.setValue(ps, newRow, 11, "secondSolenoidStatus", Types.INTEGER); - ScssPersistenceHandler.this.setValue(ps, newRow, 12, "preTransmission", Types.INTEGER); + ScssPersistenceHandler.this.setValue(ps, newRow, 12, "prePressure", Types.INTEGER); ScssPersistenceHandler.this.setValue(ps, newRow, 13, "internetTraffic", Types.INTEGER); ScssPersistenceHandler.this.setValue(ps, newRow, 14, "loadFactor", Types.INTEGER); ScssPersistenceHandler.this.setValue(ps, newRow, 15, "dataTime", Types.TIMESTAMP); diff --git a/src/main/resources/command_change.sql b/src/main/resources/command_change.sql index 6221ca9..f2ddc2a 100644 --- a/src/main/resources/command_change.sql +++ b/src/main/resources/command_change.sql @@ -84,3 +84,8 @@ SET `format` = '%s年%s月%s天 %s:%s:%s', `decode_name` = NULL WHERE `id` = 12007; +UPDATE `command_points` +SET `field` = 'prePressure' +WHERE `command_id` = 10102 + and `field` = 'preTransmission'; + diff --git a/src/main/resources/sql/CREATE_SCSS.sql b/src/main/resources/sql/CREATE_SCSS.sql index 4370088..735451e 100644 --- a/src/main/resources/sql/CREATE_SCSS.sql +++ b/src/main/resources/sql/CREATE_SCSS.sql @@ -12,7 +12,7 @@ CREATE TABLE `$TableName$` `solar_voltage` decimal(10, 1) NULL DEFAULT NULL COMMENT '太阳能电压', `remaining_time_action` int NULL DEFAULT NULL COMMENT '动作剩余时间', `second_solenoid_status` int NULL DEFAULT NULL COMMENT '第二个电磁阀状态', - `pre_transmission` int NULL DEFAULT NULL COMMENT '输压', + `pre_pressure` int NULL DEFAULT NULL COMMENT '输压', `internet_traffic` int NULL DEFAULT NULL COMMENT '流量', `load_factor` int NULL DEFAULT NULL COMMENT '载荷因子', `data_time` datetime NULL DEFAULT NULL COMMENT '日期时间', diff --git a/src/main/resources/sql/INSERT_SCSS.sql b/src/main/resources/sql/INSERT_SCSS.sql index 1b13154..767eb95 100644 --- a/src/main/resources/sql/INSERT_SCSS.sql +++ b/src/main/resources/sql/INSERT_SCSS.sql @@ -1,6 +1,6 @@ INSERT INTO `$TableName$`(`id`, `device_id`, `created_time`, `collection_time`, `receive_time`, `cas_pressure`, `oil_pressure`, `first_solenoid_status`, `battery_voltage`, `solar_voltage`, - `remaining_time_action`, `second_solenoid_status`, `pre_transmission`, `internet_traffic`, + `remaining_time_action`, `second_solenoid_status`, `pre_pressure`, `internet_traffic`, `load_factor`, `data_time`, `show_delay`, `open_well_sampling_interval`, `close_well_sampling_interval`, `ctl_model`, `min_pressure`, `max_pressure`, `pressure_min_voltage`, `pressure_max_voltage`, `oil_min`, `oil_max`, @@ -44,7 +44,7 @@ ON DUPLICATE KEY UPDATE receive_time=VALUES(receive_time), solar_voltage=VALUES(solar_voltage), remaining_time_action=VALUES(remaining_time_action), second_solenoid_status=VALUES(second_solenoid_status), - pre_transmission=VALUES(pre_transmission), + pre_pressure=VALUES(pre_pressure), internet_traffic=VALUES(internet_traffic), load_factor=VALUES(load_factor), data_time=VALUES(data_time),