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

ETC添加电压字段

This commit is contained in:
wangshilong 2025-03-06 20:31:03 +08:00
parent d56fe465d7
commit 0a7a96e637
4 changed files with 84 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,6 +29,7 @@ public class EtcPersistenceHandler extends AbstractPersistenceHandler {
ETC_COLUMN_MAPPING_MAP.put("cas_pressure", "casPressure"); ETC_COLUMN_MAPPING_MAP.put("cas_pressure", "casPressure");
ETC_COLUMN_MAPPING_MAP.put("oil_pressure", "oilPressure"); ETC_COLUMN_MAPPING_MAP.put("oil_pressure", "oilPressure");
ETC_COLUMN_MAPPING_MAP.put("pre_pressure", "prePressure"); ETC_COLUMN_MAPPING_MAP.put("pre_pressure", "prePressure");
ETC_COLUMN_MAPPING_MAP.put("battery_voltage", "batteryVoltage");
ETC_COLUMN_MAPPING_MAP.put("plunger_rise_time", "plungerRiseTime"); ETC_COLUMN_MAPPING_MAP.put("plunger_rise_time", "plungerRiseTime");
ETC_COLUMN_MAPPING_MAP.put("arrival_sensor_delay_time", "arrivalSensorDelayTime"); ETC_COLUMN_MAPPING_MAP.put("arrival_sensor_delay_time", "arrivalSensorDelayTime");
ETC_COLUMN_MAPPING_MAP.put("well_shut_in_time", "wellShutInTime"); ETC_COLUMN_MAPPING_MAP.put("well_shut_in_time", "wellShutInTime");
@ -100,6 +101,7 @@ public class EtcPersistenceHandler extends AbstractPersistenceHandler {
EtcPersistenceHandler.this.setValue(ps, newRow, 30, "openResetTubPressure", Types.VARCHAR); EtcPersistenceHandler.this.setValue(ps, newRow, 30, "openResetTubPressure", Types.VARCHAR);
EtcPersistenceHandler.this.setValue(ps, newRow, 31, "openTubPressureStableTime", Types.VARCHAR); EtcPersistenceHandler.this.setValue(ps, newRow, 31, "openTubPressureStableTime", Types.VARCHAR);
EtcPersistenceHandler.this.setValue(ps, newRow, 32, "prePressure", Types.DECIMAL); EtcPersistenceHandler.this.setValue(ps, newRow, 32, "prePressure", Types.DECIMAL);
EtcPersistenceHandler.this.setValue(ps, newRow, 33, "batteryVoltage", Types.DECIMAL);
return ps.executeUpdate(); return ps.executeUpdate();
} }
}); });

78
src/main/resources/ETC_add_field_20250306.sql Normal file
View File

@ -0,0 +1,78 @@
INSERT INTO `command_points` (`id`, `command_id`, `field`, `name`, `details`, `start_address`, `step_size`, `factor`, `precision`, `use_hex`, `byte_order`, `format`, `decode_name`)
VALUES (12032, 10202, 'batteryVoltage', '电池电压', NULL, 30, 1, 1000.00, 3, NULL, NULL, NULL, 'factor');
-- 71台
select concat('ALTER TABLE `t_device_data_', id, '` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT \'电池电压：单位V, *10\' AFTER `pre_pressure`;') add_sql from device where product = 5;
ALTER TABLE `t_device_data_2000` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *10' AFTER `pre_pressure`;
ALTER TABLE `t_device_data_2001` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *10' AFTER `pre_pressure`;
ALTER TABLE `t_device_data_2002` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *10' AFTER `pre_pressure`;
ALTER TABLE `t_device_data_2003` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *10' AFTER `pre_pressure`;
ALTER TABLE `t_device_data_2004` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *10' AFTER `pre_pressure`;
ALTER TABLE `t_device_data_2005` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *10' AFTER `pre_pressure`;
ALTER TABLE `t_device_data_2007` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *10' AFTER `pre_pressure`;
ALTER TABLE `t_device_data_2008` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *10' AFTER `pre_pressure`;
ALTER TABLE `t_device_data_2009` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *10' AFTER `pre_pressure`;
ALTER TABLE `t_device_data_2010` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *10' AFTER `pre_pressure`;
ALTER TABLE `t_device_data_2011` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *10' AFTER `pre_pressure`;
ALTER TABLE `t_device_data_2012` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *10' AFTER `pre_pressure`;
ALTER TABLE `t_device_data_2013` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *10' AFTER `pre_pressure`;
ALTER TABLE `t_device_data_2014` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *10' AFTER `pre_pressure`;
ALTER TABLE `t_device_data_2015` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *10' AFTER `pre_pressure`;
ALTER TABLE `t_device_data_2016` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *10' AFTER `pre_pressure`;
ALTER TABLE `t_device_data_2017` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *10' AFTER `pre_pressure`;
ALTER TABLE `t_device_data_2018` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *10' AFTER `pre_pressure`;
ALTER TABLE `t_device_data_2019` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *10' AFTER `pre_pressure`;
ALTER TABLE `t_device_data_2020` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *10' AFTER `pre_pressure`;
ALTER TABLE `t_device_data_2021` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *10' AFTER `pre_pressure`;
ALTER TABLE `t_device_data_2022` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *10' AFTER `pre_pressure`;
ALTER TABLE `t_device_data_2023` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *10' AFTER `pre_pressure`;
ALTER TABLE `t_device_data_2024` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *10' AFTER `pre_pressure`;
ALTER TABLE `t_device_data_2025` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *10' AFTER `pre_pressure`;
ALTER TABLE `t_device_data_2026` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *10' AFTER `pre_pressure`;
ALTER TABLE `t_device_data_2027` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *10' AFTER `pre_pressure`;
ALTER TABLE `t_device_data_2028` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *10' AFTER `pre_pressure`;
ALTER TABLE `t_device_data_2029` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *10' AFTER `pre_pressure`;
ALTER TABLE `t_device_data_2030` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *10' AFTER `pre_pressure`;
ALTER TABLE `t_device_data_2031` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *10' AFTER `pre_pressure`;
ALTER TABLE `t_device_data_2032` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *10' AFTER `pre_pressure`;
ALTER TABLE `t_device_data_2033` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *10' AFTER `pre_pressure`;
ALTER TABLE `t_device_data_2034` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *10' AFTER `pre_pressure`;
ALTER TABLE `t_device_data_2035` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *10' AFTER `pre_pressure`;
ALTER TABLE `t_device_data_2036` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *10' AFTER `pre_pressure`;
ALTER TABLE `t_device_data_2037` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *10' AFTER `pre_pressure`;
ALTER TABLE `t_device_data_2038` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *10' AFTER `pre_pressure`;
ALTER TABLE `t_device_data_2039` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *10' AFTER `pre_pressure`;
ALTER TABLE `t_device_data_2040` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *10' AFTER `pre_pressure`;
ALTER TABLE `t_device_data_2041` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *10' AFTER `pre_pressure`;
ALTER TABLE `t_device_data_2042` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *10' AFTER `pre_pressure`;
ALTER TABLE `t_device_data_2043` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *10' AFTER `pre_pressure`;
ALTER TABLE `t_device_data_2044` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *10' AFTER `pre_pressure`;
ALTER TABLE `t_device_data_2045` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *10' AFTER `pre_pressure`;
ALTER TABLE `t_device_data_2046` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *10' AFTER `pre_pressure`;
ALTER TABLE `t_device_data_2047` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *10' AFTER `pre_pressure`;
ALTER TABLE `t_device_data_2048` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *10' AFTER `pre_pressure`;
ALTER TABLE `t_device_data_2049` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *10' AFTER `pre_pressure`;
ALTER TABLE `t_device_data_2050` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *10' AFTER `pre_pressure`;
ALTER TABLE `t_device_data_2051` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *10' AFTER `pre_pressure`;
ALTER TABLE `t_device_data_2052` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *10' AFTER `pre_pressure`;
ALTER TABLE `t_device_data_2053` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *10' AFTER `pre_pressure`;
ALTER TABLE `t_device_data_2054` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *10' AFTER `pre_pressure`;
ALTER TABLE `t_device_data_2055` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *10' AFTER `pre_pressure`;
ALTER TABLE `t_device_data_2056` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *10' AFTER `pre_pressure`;
ALTER TABLE `t_device_data_2057` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *10' AFTER `pre_pressure`;
ALTER TABLE `t_device_data_2058` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *10' AFTER `pre_pressure`;
ALTER TABLE `t_device_data_2059` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *10' AFTER `pre_pressure`;
ALTER TABLE `t_device_data_2060` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *10' AFTER `pre_pressure`;
ALTER TABLE `t_device_data_2061` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *10' AFTER `pre_pressure`;
ALTER TABLE `t_device_data_2062` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *10' AFTER `pre_pressure`;
ALTER TABLE `t_device_data_2063` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *10' AFTER `pre_pressure`;
ALTER TABLE `t_device_data_2064` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *10' AFTER `pre_pressure`;
ALTER TABLE `t_device_data_2065` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *10' AFTER `pre_pressure`;
ALTER TABLE `t_device_data_2066` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *10' AFTER `pre_pressure`;
ALTER TABLE `t_device_data_2067` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *10' AFTER `pre_pressure`;
ALTER TABLE `t_device_data_2068` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *10' AFTER `pre_pressure`;
ALTER TABLE `t_device_data_2069` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *10' AFTER `pre_pressure`;
ALTER TABLE `t_device_data_2070` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *10' AFTER `pre_pressure`;
ALTER TABLE `t_device_data_2071` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *10' AFTER `pre_pressure`;

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

@ -12,6 +12,7 @@ CREATE TABLE `$TableName$`
`cas_pressure` decimal(10, 1) NULL DEFAULT NULL COMMENT '套压', `cas_pressure` decimal(10, 1) NULL DEFAULT NULL COMMENT '套压',
`oil_pressure` decimal(10, 1) NULL DEFAULT NULL COMMENT '油压', `oil_pressure` decimal(10, 1) NULL DEFAULT NULL COMMENT '油压',
`pre_pressure` decimal(10, 1) NULL DEFAULT NULL COMMENT '输压', `pre_pressure` decimal(10, 1) NULL DEFAULT NULL COMMENT '输压',
`battery_voltage` decimal(10, 2) NULL DEFAULT NULL COMMENT '电池电压：单位V, *10',
`plunger_rise_time` varchar(10) NULL DEFAULT NULL COMMENT '柱塞上升时间', `plunger_rise_time` varchar(10) NULL DEFAULT NULL COMMENT '柱塞上升时间',
`arrival_sensor_delay_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 '关井时间', `well_shut_in_time` varchar(10) NULL DEFAULT NULL COMMENT '关井时间',

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

@ -8,8 +8,8 @@ INSERT INTO `$TableName$` (`id`, `device_id`, `created_time`, `collection_time`,
`open_cas_pressure`, `open_reset_cas_pressure`, `open_cas_pressure_stable_time`, `open_cas_pressure`, `open_reset_cas_pressure`, `open_cas_pressure_stable_time`,
`close_cas_pressure`, `close_trip_cas_pressure`, `close_cas_pressure_stable_time`, `close_cas_pressure`, `close_trip_cas_pressure`, `close_cas_pressure_stable_time`,
`tub_pressure_switch`, `tub_pressure_sensor_range`, `open_tub_pressure`, `tub_pressure_switch`, `tub_pressure_sensor_range`, `open_tub_pressure`,
`open_reset_tub_pressure`, `open_tub_pressure_stable_time`, `pre_pressure`) `open_reset_tub_pressure`, `open_tub_pressure_stable_time`, `pre_pressure`, `battery_voltage`)
VALUES (?, ?, NOW(), ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) VALUES (?, ?, NOW(), ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
ON DUPLICATE KEY UPDATE receive_time=VALUES(receive_time), ON DUPLICATE KEY UPDATE receive_time=VALUES(receive_time),
solenoid_valve_status=VALUES(solenoid_valve_status), solenoid_valve_status=VALUES(solenoid_valve_status),
controller_current_status=VALUES(controller_current_status), controller_current_status=VALUES(controller_current_status),
@ -18,6 +18,7 @@ ON DUPLICATE KEY UPDATE receive_time=VALUES(receive_time),
cas_pressure=VALUES(cas_pressure), cas_pressure=VALUES(cas_pressure),
oil_pressure=VALUES(oil_pressure), oil_pressure=VALUES(oil_pressure),
pre_pressure=VALUES(pre_pressure), pre_pressure=VALUES(pre_pressure),
battery_voltage=VALUES(battery_voltage),
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),