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

Merge branch 'develop' of https://e.coding.net/g-dupe6279/chuanqing/gasWellWatch into develop

This commit is contained in:
qinjie 2024-12-12 14:52:28 +08:00
parent 642ed4e302 77781a8ef9
commit 8f75bf36e9
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,6 +28,7 @@ public class EtcPersistenceHandler extends AbstractPersistenceHandler {
ETC_COLUMN_MAPPING_MAP.put("current_status_start_time", "currentStatusStartTime"); ETC_COLUMN_MAPPING_MAP.put("current_status_start_time", "currentStatusStartTime");
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("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");

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

@ -130,7 +130,7 @@ public class ScssPersistenceHandler extends AbstractPersistenceHandler {
ScssPersistenceHandler.this.setValue(ps, newRow, 7, "firstSolenoidStatus", Types.INTEGER); ScssPersistenceHandler.this.setValue(ps, newRow, 7, "firstSolenoidStatus", Types.INTEGER);
ScssPersistenceHandler.this.setValue(ps, newRow, 8, "batteryVoltage", Types.DECIMAL); ScssPersistenceHandler.this.setValue(ps, newRow, 8, "batteryVoltage", Types.DECIMAL);
ScssPersistenceHandler.this.setValue(ps, newRow, 9, "solarVoltage", 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, 11, "secondSolenoidStatus", Types.INTEGER);
ScssPersistenceHandler.this.setValue(ps, newRow, 12, "prePressure", 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, 13, "internetTraffic", Types.INTEGER);

2
src/main/resources/sql/CREATE_SCSS.sql
View File

@ -10,7 +10,7 @@ CREATE TABLE `$TableName$`
`first_solenoid_status` int NULL DEFAULT NULL COMMENT '当前第一个电磁阀状态', `first_solenoid_status` int NULL DEFAULT NULL COMMENT '当前第一个电磁阀状态',
`battery_voltage` decimal(10, 1) NULL DEFAULT NULL COMMENT '电池电压', `battery_voltage` decimal(10, 1) NULL DEFAULT NULL COMMENT '电池电压',
`solar_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 '第二个电磁阀状态', `second_solenoid_status` int NULL DEFAULT NULL COMMENT '第二个电磁阀状态',
`pre_pressure` int NULL DEFAULT NULL COMMENT '输压', `pre_pressure` int NULL DEFAULT NULL COMMENT '输压',
`internet_traffic` int NULL DEFAULT NULL COMMENT '流量', `internet_traffic` int NULL DEFAULT NULL COMMENT '流量',