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 300c670..88d7e63 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 @@ -38,19 +38,16 @@ public class EtcPersistenceHandler extends AbstractPersistenceHandler { EtcPersistenceHandler.this.setValue(ps, newRow, 2, "deviceId", Types.BIGINT); EtcPersistenceHandler.this.setValue(ps, newRow, 3, "collectionTime", Types.TIMESTAMP); EtcPersistenceHandler.this.setValue(ps, newRow, 4, "receiveTime", Types.TIMESTAMP); - EtcPersistenceHandler.this.setValue(ps, newRow, 5, "solenoidValveAClosedPlungerNotReached", Types.TIMESTAMP); - EtcPersistenceHandler.this.setValue(ps, newRow, 6, "solenoidValveAOpenedPlungerNotReached", Types.INTEGER); - EtcPersistenceHandler.this.setValue(ps, newRow, 7, "solenoidValveAClosedPlungerReached", Types.INTEGER); - EtcPersistenceHandler.this.setValue(ps, newRow, 8, "solenoidValveAOpenedPlungerReached", Types.INTEGER); - EtcPersistenceHandler.this.setValue(ps, newRow, 9, "controllerCurrentStatus", Types.VARCHAR); - EtcPersistenceHandler.this.setValue(ps, newRow, 10, "currentStatusRemainingTime", Types.VARCHAR); - EtcPersistenceHandler.this.setValue(ps, newRow, 11, "currentStatusStartTime", Types.DECIMAL); - EtcPersistenceHandler.this.setValue(ps, newRow, 12, "casPressure", Types.DECIMAL); - EtcPersistenceHandler.this.setValue(ps, newRow, 13, "oilPressure", Types.DECIMAL); - EtcPersistenceHandler.this.setValue(ps, newRow, 13, "plungerRiseTime", Types.DECIMAL); - EtcPersistenceHandler.this.setValue(ps, newRow, 13, "arrivalSensorDelayTime", Types.DECIMAL); - EtcPersistenceHandler.this.setValue(ps, newRow, 13, "wellShutInTime", Types.DECIMAL); - EtcPersistenceHandler.this.setValue(ps, newRow, 13, "afterFlowTime", Types.DECIMAL); + EtcPersistenceHandler.this.setValue(ps, newRow, 5, "solenoidValveStatus", Types.INTEGER); + EtcPersistenceHandler.this.setValue(ps, newRow, 6, "controllerCurrentStatus", Types.INTEGER); + EtcPersistenceHandler.this.setValue(ps, newRow, 7, "currentStatusRemainingTime", Types.VARCHAR); + EtcPersistenceHandler.this.setValue(ps, newRow, 8, "currentStatusStartTime", Types.TIMESTAMP); + EtcPersistenceHandler.this.setValue(ps, newRow, 9, "casPressure", Types.DECIMAL); + EtcPersistenceHandler.this.setValue(ps, newRow, 10, "oilPressure", Types.DECIMAL); + EtcPersistenceHandler.this.setValue(ps, newRow, 11, "plungerRiseTime", Types.VARCHAR); + EtcPersistenceHandler.this.setValue(ps, newRow, 12, "arrivalSensorDelayTime", Types.VARCHAR); + EtcPersistenceHandler.this.setValue(ps, newRow, 13, "wellShutInTime", Types.VARCHAR); + EtcPersistenceHandler.this.setValue(ps, newRow, 14, "afterFlowTime", Types.VARCHAR); return ps.executeUpdate(); } }); diff --git a/src/main/resources/command_change.sql b/src/main/resources/command_change.sql index 79b29cd..464ea2f 100644 --- a/src/main/resources/command_change.sql +++ b/src/main/resources/command_change.sql @@ -71,3 +71,11 @@ INSERT INTO `command_points` (`id`, `command_id`, `field`, `name`, `details`, `s `precision`, `format`, `decode_name`) VALUES (12013, 10203, 'afterFlowTime', '续流时间', '', 145, 3, NULL, NULL, '%s:%s:%s', 'stringTime'); + +delete +from `command_points` +where `id` in (12002, 12003, 12004); +update `command_points` +set details = '电磁阀A状态' +where `id` = 12001 + diff --git a/src/main/resources/sql/CREATE_ETC.sql b/src/main/resources/sql/CREATE_ETC.sql index d841f90..e7a6013 100644 --- a/src/main/resources/sql/CREATE_ETC.sql +++ b/src/main/resources/sql/CREATE_ETC.sql @@ -1,23 +1,20 @@ CREATE TABLE `$TableName$` ( - `id` bigint NOT NULL COMMENT '主键', - `device_id` int NOT NULL COMMENT '设备标识', - `created_time` datetime NOT NULL COMMENT '数据落库时间', - `collection_time` datetime NOT NULL COMMENT '采集指令下发时间', - `receive_time` datetime NOT NULL COMMENT '接收到数据时间', - `solenoid_valve_a_closed_plunger_not_reached` int NULL DEFAULT NULL COMMENT '电磁阀A关闭,柱塞未到达', - `solenoid_valve_a_opened_plunger_not_reached` int NULL DEFAULT NULL COMMENT '电磁阀A开启,柱塞未到达', - `solenoid_valve_a_closed_plunger_reached` int NULL DEFAULT NULL COMMENT '电磁阀A关闭,柱塞到达', - `solenoid_valve_a_opened_plunger_reached` int NULL DEFAULT NULL COMMENT '电磁阀A开启,柱塞到达', - `controller_current_status` int NULL DEFAULT NULL COMMENT '控制器当前状态', - `current_status_remaining_time` varchar(10) NULL DEFAULT NULL COMMENT '当前状态剩余时间', - `current_status_start_time` datetime NULL DEFAULT NULL COMMENT '当前状态开始时间', - `cas_pressure` decimal(10, 1) NULL DEFAULT NULL COMMENT '套压', - `oil_pressure` decimal(10, 1) NULL DEFAULT NULL COMMENT '油压', - `plunger_rise_time` varchar(10) NULL DEFAULT NULL COMMENT '柱塞上升时间', - `arrival_sensor_delay_time` varchar(10) NULL DEFAULT NULL COMMENT '到达传感器延时时间', - `well_shut_in_time` varchar(10) NULL DEFAULT NULL COMMENT '关井时间', - `after_flow_time` varchar(10) NULL DEFAULT NULL COMMENT '续流时间', + `id` bigint NOT NULL COMMENT '主键', + `device_id` int NOT NULL COMMENT '设备标识', + `created_time` datetime NOT NULL COMMENT '数据落库时间', + `collection_time` datetime NOT NULL COMMENT '采集指令下发时间', + `receive_time` datetime NOT NULL COMMENT '接收到数据时间', + `solenoid_valve_status` int NULL DEFAULT NULL COMMENT '电磁阀状态', + `controller_current_status` int NULL DEFAULT NULL COMMENT '控制器当前状态', + `current_status_remaining_time` varchar(10) NULL DEFAULT NULL COMMENT '当前状态剩余时间', + `current_status_start_time` datetime NULL DEFAULT NULL COMMENT '当前状态开始时间', + `cas_pressure` decimal(10, 1) NULL DEFAULT NULL COMMENT '套压', + `oil_pressure` decimal(10, 1) NULL DEFAULT NULL COMMENT '油压', + `plunger_rise_time` varchar(10) NULL DEFAULT NULL COMMENT '柱塞上升时间', + `arrival_sensor_delay_time` varchar(10) NULL DEFAULT NULL COMMENT '到达传感器延时时间', + `well_shut_in_time` varchar(10) NULL DEFAULT NULL COMMENT '关井时间', + `after_flow_time` varchar(10) NULL DEFAULT NULL COMMENT '续流时间', PRIMARY KEY (`id`) USING BTREE, UNIQUE INDEX `udx_device_create_time` (`device_id` ASC, `collection_time` ASC) USING BTREE COMMENT '设备采集数据唯一键' ) ENGINE = InnoDB COMMENT = '设备ID：$DeviceId$的采集数据' \ No newline at end of file diff --git a/src/main/resources/sql/INSERT_ETC.sql b/src/main/resources/sql/INSERT_ETC.sql index 9532b1d..d792910 100644 --- a/src/main/resources/sql/INSERT_ETC.sql +++ b/src/main/resources/sql/INSERT_ETC.sql @@ -1,15 +1,11 @@ INSERT INTO `$TableName$` (`id`, `device_id`, `created_time`, `collection_time`, `receive_time`, - `solenoid_valve_a_closed_plunger_not_reached`, `solenoid_valve_a_opened_plunger_not_reached`, - `solenoid_valve_a_closed_plunger_reached`, `solenoid_valve_a_opened_plunger_reached`, + `solenoid_valve_status`, `controller_current_status`, `current_status_remaining_time`, `current_status_start_time`, `cas_pressure`, `oil_pressure`, `plunger_rise_time`, `arrival_sensor_delay_time`, `well_shut_in_time`, `after_flow_time`) -VALUES (?, ?, NOW(), ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) +VALUES (?, ?, NOW(), ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON DUPLICATE KEY UPDATE receive_time=VALUES(receive_time), - solenoid_valve_a_closed_plunger_not_reached=VALUES(solenoid_valve_a_closed_plunger_not_reached), - solenoid_valve_a_opened_plunger_not_reached=VALUES(solenoid_valve_a_opened_plunger_not_reached), - solenoid_valve_a_closed_plunger_reached=VALUES(solenoid_valve_a_closed_plunger_reached), - solenoid_valve_a_opened_plunger_reached=VALUES(solenoid_valve_a_opened_plunger_reached), + solenoid_valve_status=VALUES(solenoid_valve_status), controller_current_status=VALUES(controller_current_status), current_status_remaining_time=VALUES(current_status_remaining_time), current_status_start_time=VALUES(current_status_start_time), @@ -18,4 +14,4 @@ ON DUPLICATE KEY UPDATE receive_time=VALUES(receive_time), plunger_rise_time=VALUES(plunger_rise_time), arrival_sensor_delay_time=VALUES(arrival_sensor_delay_time), well_shut_in_time=VALUES(well_shut_in_time), - after_flow_time=VALUES(after_flow_time) + after_flow_time=VALUES(after_flow_time) \ No newline at end of file