project-zsy
/
gasWellWatch
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ETC线圈状态读取错误修复

This commit is contained in:
wangshilong 2024-11-26 18:29:08 +08:00
parent af5612a785
commit 8a8b9c206b
4 changed files with 37 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/com/isu/gaswellwatch/modbus/data/impl/EtcPersistenceHandler.java
View File

@ -38,19 +38,16 @@ public class EtcPersistenceHandler extends AbstractPersistenceHandler {
EtcPersistenceHandler.this.setValue(ps, newRow, 2, "deviceId", Types.BIGINT); EtcPersistenceHandler.this.setValue(ps, newRow, 2, "deviceId", Types.BIGINT);
EtcPersistenceHandler.this.setValue(ps, newRow, 3, "collectionTime", Types.TIMESTAMP); EtcPersistenceHandler.this.setValue(ps, newRow, 3, "collectionTime", Types.TIMESTAMP);
EtcPersistenceHandler.this.setValue(ps, newRow, 4, "receiveTime", 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, 5, "solenoidValveStatus", Types.INTEGER);
EtcPersistenceHandler.this.setValue(ps, newRow, 6, "solenoidValveAOpenedPlungerNotReached", Types.INTEGER); EtcPersistenceHandler.this.setValue(ps, newRow, 6, "controllerCurrentStatus", Types.INTEGER);
EtcPersistenceHandler.this.setValue(ps, newRow, 7, "solenoidValveAClosedPlungerReached", Types.INTEGER); EtcPersistenceHandler.this.setValue(ps, newRow, 7, "currentStatusRemainingTime", Types.VARCHAR);
EtcPersistenceHandler.this.setValue(ps, newRow, 8, "solenoidValveAOpenedPlungerReached", Types.INTEGER); EtcPersistenceHandler.this.setValue(ps, newRow, 8, "currentStatusStartTime", Types.TIMESTAMP);
EtcPersistenceHandler.this.setValue(ps, newRow, 9, "controllerCurrentStatus", Types.VARCHAR); EtcPersistenceHandler.this.setValue(ps, newRow, 9, "casPressure", Types.DECIMAL);
EtcPersistenceHandler.this.setValue(ps, newRow, 10, "currentStatusRemainingTime", Types.VARCHAR); EtcPersistenceHandler.this.setValue(ps, newRow, 10, "oilPressure", Types.DECIMAL);
EtcPersistenceHandler.this.setValue(ps, newRow, 11, "currentStatusStartTime", Types.DECIMAL); EtcPersistenceHandler.this.setValue(ps, newRow, 11, "plungerRiseTime", Types.VARCHAR);
EtcPersistenceHandler.this.setValue(ps, newRow, 12, "casPressure", Types.DECIMAL); EtcPersistenceHandler.this.setValue(ps, newRow, 12, "arrivalSensorDelayTime", Types.VARCHAR);
EtcPersistenceHandler.this.setValue(ps, newRow, 13, "oilPressure", Types.DECIMAL); EtcPersistenceHandler.this.setValue(ps, newRow, 13, "wellShutInTime", Types.VARCHAR);
EtcPersistenceHandler.this.setValue(ps, newRow, 13, "plungerRiseTime", Types.DECIMAL); EtcPersistenceHandler.this.setValue(ps, newRow, 14, "afterFlowTime", Types.VARCHAR);
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);
return ps.executeUpdate(); return ps.executeUpdate();
} }
}); });

8
src/main/resources/command_change.sql
View File

@ -71,3 +71,11 @@ INSERT INTO `command_points` (`id`, `command_id`, `field`, `name`, `details`, `s
`precision`, `format`, `decode_name`) `precision`, `format`, `decode_name`)
VALUES (12013, 10203, 'afterFlowTime', '续流时间', '', 145, 3, NULL, NULL, '%s:%s:%s', 'stringTime'); 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

33
src/main/resources/sql/CREATE_ETC.sql
View File

@ -1,23 +1,20 @@
CREATE TABLE `$TableName$` CREATE TABLE `$TableName$`
( (
`id` bigint NOT NULL COMMENT '主键', `id` bigint NOT NULL COMMENT '主键',
`device_id` int NOT NULL COMMENT '设备标识', `device_id` int NOT NULL COMMENT '设备标识',
`created_time` datetime NOT NULL COMMENT '数据落库时间', `created_time` datetime NOT NULL COMMENT '数据落库时间',
`collection_time` datetime NOT NULL COMMENT '采集指令下发时间', `collection_time` datetime NOT NULL COMMENT '采集指令下发时间',
`receive_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_status` int NULL DEFAULT NULL COMMENT '电磁阀状态',
`solenoid_valve_a_opened_plunger_not_reached` int NULL DEFAULT NULL COMMENT '电磁阀A开启,柱塞未到达', `controller_current_status` int NULL DEFAULT NULL COMMENT '控制器当前状态',
`solenoid_valve_a_closed_plunger_reached` int NULL DEFAULT NULL COMMENT '电磁阀A关闭,柱塞到达', `current_status_remaining_time` varchar(10) NULL DEFAULT NULL COMMENT '当前状态剩余时间',
`solenoid_valve_a_opened_plunger_reached` int NULL DEFAULT NULL COMMENT '电磁阀A开启,柱塞到达', `current_status_start_time` datetime NULL DEFAULT NULL COMMENT '当前状态开始时间',
`controller_current_status` int NULL DEFAULT NULL COMMENT '控制器当前状态', `cas_pressure` decimal(10, 1) NULL DEFAULT NULL COMMENT '套压',
`current_status_remaining_time` varchar(10) NULL DEFAULT NULL COMMENT '当前状态剩余时间', `oil_pressure` decimal(10, 1) NULL DEFAULT NULL COMMENT '油压',
`current_status_start_time` datetime NULL DEFAULT NULL COMMENT '当前状态开始时间', `plunger_rise_time` varchar(10) NULL DEFAULT NULL COMMENT '柱塞上升时间',
`cas_pressure` decimal(10, 1) NULL DEFAULT NULL COMMENT '套压', `arrival_sensor_delay_time` varchar(10) NULL DEFAULT NULL COMMENT '到达传感器延时时间',
`oil_pressure` decimal(10, 1) NULL DEFAULT NULL COMMENT '油压', `well_shut_in_time` varchar(10) NULL DEFAULT NULL COMMENT '关井时间',
`plunger_rise_time` varchar(10) NULL DEFAULT NULL COMMENT '柱塞上升时间', `after_flow_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, PRIMARY KEY (`id`) USING BTREE,
UNIQUE INDEX `udx_device_create_time` (`device_id` ASC, `collection_time` ASC) USING BTREE COMMENT '设备采集数据唯一键' UNIQUE INDEX `udx_device_create_time` (`device_id` ASC, `collection_time` ASC) USING BTREE COMMENT '设备采集数据唯一键'
) ENGINE = InnoDB COMMENT = '设备ID：$DeviceId$的采集数据' ) ENGINE = InnoDB COMMENT = '设备ID：$DeviceId$的采集数据'

12
src/main/resources/sql/INSERT_ETC.sql
View File

@ -1,15 +1,11 @@
INSERT INTO `$TableName$` (`id`, `device_id`, `created_time`, `collection_time`, `receive_time`, 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_status`,
`solenoid_valve_a_closed_plunger_reached`, `solenoid_valve_a_opened_plunger_reached`,
`controller_current_status`, `current_status_remaining_time`, `current_status_start_time`, `controller_current_status`, `current_status_remaining_time`, `current_status_start_time`,
`cas_pressure`, `oil_pressure`, `plunger_rise_time`, `arrival_sensor_delay_time`, `cas_pressure`, `oil_pressure`, `plunger_rise_time`, `arrival_sensor_delay_time`,
`well_shut_in_time`, `after_flow_time`) `well_shut_in_time`, `after_flow_time`)
VALUES (?, ?, NOW(), ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) VALUES (?, ?, NOW(), ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
ON DUPLICATE KEY UPDATE receive_time=VALUES(receive_time), 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_status=VALUES(solenoid_valve_status),
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),
controller_current_status=VALUES(controller_current_status), controller_current_status=VALUES(controller_current_status),
current_status_remaining_time=VALUES(current_status_remaining_time), current_status_remaining_time=VALUES(current_status_remaining_time),
current_status_start_time=VALUES(current_status_start_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), plunger_rise_time=VALUES(plunger_rise_time),
arrival_sensor_delay_time=VALUES(arrival_sensor_delay_time), arrival_sensor_delay_time=VALUES(arrival_sensor_delay_time),
well_shut_in_time=VALUES(well_shut_in_time), well_shut_in_time=VALUES(well_shut_in_time),
after_flow_time=VALUES(after_flow_time) after_flow_time=VALUES(after_flow_time)