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

Compare commits

base: project-zsy:c7cbaef9cbeee75afc0f1a18019d84e17c5ad99f
Branches Tags
project-zsy:develop
..
compare: project-zsy:b351dd4475e71c7d0f4ea64c89cc808ffad826d4
Branches Tags
project-zsy:develop

No commits in common. "c7cbaef9cbeee75afc0f1a18019d84e17c5ad99f" and "b351dd4475e71c7d0f4ea64c89cc808ffad826d4" have entirely different histories.
c7cbaef9cb ... b351dd4475

20 changed files with 141 additions and 388 deletions
Show Stats Expand all files Collapse all files

5
src/main/java/com/isu/gaswellwatch/controller/DeviceController.java
View File

@ -41,9 +41,8 @@ public class DeviceController {
* @return * @return
*/ */
@GetMapping(value = "/gasStation") @GetMapping(value = "/gasStation")
public List<GasStationVO> queryGasStationList(@RequestParam(required = false) Long blockId, public List<GasStationVO> queryGasStationList(@RequestParam String gasStationName) {
@RequestParam String gasStationName) { return this.deviceService.queryGasStationList(gasStationName);
return this.deviceService.queryGasStationList(blockId, gasStationName);
} }
/** /**

2
src/main/java/com/isu/gaswellwatch/dao/DeviceDao.java
View File

@ -17,7 +17,7 @@ import java.util.List;
@Repository @Repository
public interface DeviceDao extends BaseMapper<Device> { public interface DeviceDao extends BaseMapper<Device> {
List<String> queryGasStationList(Long blockId, String gasStationName); List<String> queryGasStationList(String gasStationName);
Page<DeviceVO> page(Page<Object> page, Page<DeviceVO> page(Page<Object> page,
@Param("gasWellName") String gasWellName, @Param("gasWellName") String gasWellName,

8
src/main/java/com/isu/gaswellwatch/modbus/data/decode/impl/weps/WepsRemainingLocalTimeDecodeHandler.java
View File

@ -34,10 +34,10 @@ public class WepsRemainingLocalTimeDecodeHandler implements DecodeHandler {
minuteSecond = StringUtils.leftPad(minuteSecond, 4, '0'); minuteSecond = StringUtils.leftPad(minuteSecond, 4, '0');
dayHour = StringUtils.leftPad(dayHour, 4, '0'); dayHour = StringUtils.leftPad(dayHour, 4, '0');
long daySeconds = TimeUnit.DAYS.toSeconds(Long.valueOf(StringUtils.substring(dayHour, 0, 2), 16)); long daySeconds = TimeUnit.DAYS.toSeconds(Long.valueOf(StringUtils.substring(dayHour, 0, 2)));
long hourSeconds = TimeUnit.HOURS.toSeconds(Long.valueOf(StringUtils.substring(dayHour, 2), 16)); long hourSeconds = TimeUnit.HOURS.toSeconds(Long.valueOf(StringUtils.substring(dayHour, 2)));
long minuteSeconds = TimeUnit.MINUTES.toSeconds(Long.valueOf(StringUtils.substring(minuteSecond, 0, 2), 16)); long minuteSeconds = TimeUnit.HOURS.toSeconds(Long.valueOf(StringUtils.substring(minuteSecond, 0, 2)));
long seconds = Long.valueOf(StringUtils.substring(minuteSecond, 2), 16); long seconds = TimeUnit.HOURS.toSeconds(Long.valueOf(StringUtils.substring(minuteSecond, 2)));
long totalSeconds = daySeconds + hourSeconds + minuteSeconds + seconds; long totalSeconds = daySeconds + hourSeconds + minuteSeconds + seconds;
long hours = TimeUnit.SECONDS.toHours(totalSeconds); long hours = TimeUnit.SECONDS.toHours(totalSeconds);

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

@ -29,7 +29,6 @@ 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");
@ -101,7 +100,6 @@ 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();
} }
}); });

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

@ -33,7 +33,6 @@ public class Knpcv1PersistenceHandler extends AbstractPersistenceHandler {
KNPC_V1_COLUMN_MAPPING_MAP.put("liquid_level", "liquidLevel"); KNPC_V1_COLUMN_MAPPING_MAP.put("liquid_level", "liquidLevel");
KNPC_V1_COLUMN_MAPPING_MAP.put("temperature", "temperature"); KNPC_V1_COLUMN_MAPPING_MAP.put("temperature", "temperature");
KNPC_V1_COLUMN_MAPPING_MAP.put("humidity", "humidity"); KNPC_V1_COLUMN_MAPPING_MAP.put("humidity", "humidity");
KNPC_V1_COLUMN_MAPPING_MAP.put("battery_Voltage", "batteryVoltage");
KNPC_V1_COLUMN_MAPPING_MAP.put("op_mode", "opmode"); KNPC_V1_COLUMN_MAPPING_MAP.put("op_mode", "opmode");
KNPC_V1_COLUMN_MAPPING_MAP.put("timer_able1", "timer1"); KNPC_V1_COLUMN_MAPPING_MAP.put("timer_able1", "timer1");
KNPC_V1_COLUMN_MAPPING_MAP.put("timer_able2", "timer2"); KNPC_V1_COLUMN_MAPPING_MAP.put("timer_able2", "timer2");
@ -141,7 +140,6 @@ public class Knpcv1PersistenceHandler extends AbstractPersistenceHandler {
Knpcv1PersistenceHandler.this.setValue(ps, newRow, 51, "tpClosePressure", Types.INTEGER); Knpcv1PersistenceHandler.this.setValue(ps, newRow, 51, "tpClosePressure", Types.INTEGER);
Knpcv1PersistenceHandler.this.setValue(ps, newRow, 52, "tpCloseTime", Types.VARCHAR); Knpcv1PersistenceHandler.this.setValue(ps, newRow, 52, "tpCloseTime", Types.VARCHAR);
Knpcv1PersistenceHandler.this.setValue(ps, newRow, 53, "tpStabilityTime", Types.INTEGER); Knpcv1PersistenceHandler.this.setValue(ps, newRow, 53, "tpStabilityTime", Types.INTEGER);
Knpcv1PersistenceHandler.this.setValue(ps, newRow, 54, "batteryVoltage", Types.DECIMAL);
return ps.executeUpdate(); return ps.executeUpdate();
} }
}); });

4
src/main/java/com/isu/gaswellwatch/modbus/data/impl/MiWepsPlugPersistenceHandler.java
View File

@ -147,9 +147,9 @@ public class MiWepsPlugPersistenceHandler extends AbstractPersistenceHandler {
MiWepsPlugPersistenceHandler.this.setValue(ps, newRow, 50, "notReachedFlowTime", Types.VARCHAR); MiWepsPlugPersistenceHandler.this.setValue(ps, newRow, 50, "notReachedFlowTime", Types.VARCHAR);
MiWepsPlugPersistenceHandler.this.setValue(ps, newRow, 51, "closeTime", Types.VARCHAR); MiWepsPlugPersistenceHandler.this.setValue(ps, newRow, 51, "closeTime", Types.VARCHAR);
MiWepsPlugPersistenceHandler.this.setValue(ps, newRow, 52, "openTime", Types.VARCHAR); MiWepsPlugPersistenceHandler.this.setValue(ps, newRow, 52, "openTime", Types.VARCHAR);
MiWepsPlugPersistenceHandler.this.setValue(ps, newRow, 53, "openPressure", Types.VARCHAR); MiWepsPlugPersistenceHandler.this.setValue(ps, newRow, 53, "openPressure", Types.DECIMAL);
MiWepsPlugPersistenceHandler.this.setValue(ps, newRow, 54, "closePressure", Types.DECIMAL); MiWepsPlugPersistenceHandler.this.setValue(ps, newRow, 54, "closePressure", Types.DECIMAL);
MiWepsPlugPersistenceHandler.this.setValue(ps, newRow, 55, "littleRisePressure", Types.VARCHAR); MiWepsPlugPersistenceHandler.this.setValue(ps, newRow, 55, "littleRisePressure", Types.DECIMAL);
MiWepsPlugPersistenceHandler.this.setValue(ps, newRow, 56, "gasCollectionMode", Types.INTEGER); MiWepsPlugPersistenceHandler.this.setValue(ps, newRow, 56, "gasCollectionMode", Types.INTEGER);
MiWepsPlugPersistenceHandler.this.setValue(ps, newRow, 57, "reserve2", Types.INTEGER); MiWepsPlugPersistenceHandler.this.setValue(ps, newRow, 57, "reserve2", Types.INTEGER);
MiWepsPlugPersistenceHandler.this.setValue(ps, newRow, 58, "protectionPressure", Types.DECIMAL); MiWepsPlugPersistenceHandler.this.setValue(ps, newRow, 58, "protectionPressure", Types.DECIMAL);

50
src/main/java/com/isu/gaswellwatch/modbus/data/listener/BusinessMessageHandlerListener.java
View File

@ -21,7 +21,10 @@ import org.springframework.amqp.core.Message;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.*; import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Slf4j @Slf4j
@Service @Service
@ -79,20 +82,18 @@ public class BusinessMessageHandlerListener implements BatchMessageListener {
} }
//根据设备ID获取设备的产品类型 //根据设备ID获取设备的产品类型
DeviceVO device = this.deviceService.getDevice(Long.valueOf(deviceId)); DeviceVO device = this.deviceService.getDevice(Long.valueOf(deviceId));
if (null == device) { if(null == device){
continue; continue;
} }
//根据对应的产品类型，用对应的气井开关字段获取开关状态(wellStatus,solenoidValveStatus,firstSolenoidStatus) //根据对应的产品类型，用对应的气井开关字段获取开关状态(wellStatus,solenoidValveStatus,firstSolenoidStatus)
String wellStatusKey = getWellStatusKey(device); String wellStatusKey = getWellStatusKey(device);
//比对新旧数据，看开关状态是否一致 //比对新旧数据，看开关状态是否一致
if (Objects.nonNull(oldObject.getString(wellStatusKey)) && !Objects.equals(oldObject.getString(wellStatusKey), newObject.getString(wellStatusKey))) { if (oldObject.getString(wellStatusKey) != null && (!oldObject.getString(wellStatusKey).equals(newObject.getString(wellStatusKey)))) {
Integer wellStatusValue = getWellStatusValue(device, newObject, wellStatusKey); deviceWellStatusMap.put(Long.valueOf(deviceId), newObject.getInteger(wellStatusKey));
if (Objects.isNull(wellStatusValue)) {
if(null==newObject.getInteger(wellStatusKey)){
continue; continue;
} }
deviceWellStatusMap.put(Long.valueOf(deviceId), wellStatusValue);
//记录开关井状态及对应的套压油压数据 //记录开关井状态及对应的套压油压数据
SwitchStatusExport switchStatusExport = new SwitchStatusExport(); SwitchStatusExport switchStatusExport = new SwitchStatusExport();
switchStatusExport.setId(snowflakeConfig.snowflakeId()); switchStatusExport.setId(snowflakeConfig.snowflakeId());
@ -101,8 +102,8 @@ public class BusinessMessageHandlerListener implements BatchMessageListener {
switchStatusExport.setCasPressure(newObject.getString("casPressure")); switchStatusExport.setCasPressure(newObject.getString("casPressure"));
switchStatusExport.setOilPressure(newObject.getString("oilPressure")); switchStatusExport.setOilPressure(newObject.getString("oilPressure"));
switchStatusExport.setBlockId(device.getGasWell().getBlockId()); switchStatusExport.setBlockId(device.getGasWell().getBlockId());
if (newObject.getInteger(wellStatusKey) != null) { if (newObject.getInteger(wellStatusKey)!=null){
switchStatusExport.setSwitchStatus(wellStatusValue == 1 ? "开井" : "关井"); switchStatusExport.setSwitchStatus(newObject.getInteger(wellStatusKey) == 1 ? "开井" : "关井");
} }
switchStatusExportList.add(switchStatusExport); switchStatusExportList.add(switchStatusExport);
} }
@ -129,8 +130,12 @@ public class BusinessMessageHandlerListener implements BatchMessageListener {
} }
} }
} }
} }
} }
} }
} }
@ -170,32 +175,7 @@ public class BusinessMessageHandlerListener implements BatchMessageListener {
wellStatusKey = "solenoidValveStatus"; wellStatusKey = "solenoidValveStatus";
} else if (PersistenceHandler.SCSS_MODBUS_TYPE.equals(device.getProduct().getCode())) { } else if (PersistenceHandler.SCSS_MODBUS_TYPE.equals(device.getProduct().getCode())) {
wellStatusKey = "firstSolenoidStatus"; wellStatusKey = "firstSolenoidStatus";
} else if (PersistenceHandler.WEPS_PLUG_MODBUS_TYPE.equals(device.getProduct().getCode())) {
wellStatusKey = "solenoidValveStatus";
} else if (PersistenceHandler.MI_WEPS_PLUG_MODBUS_TYPE.equals(device.getProduct().getCode())) {
wellStatusKey = "currentStatus";
} }
return wellStatusKey; return wellStatusKey;
} }
private static Integer getWellStatusValue(DeviceVO device, JSONObject newObject, String wellStatusKey) {
Integer wellStatus = newObject.getInteger(wellStatusKey);
if (PersistenceHandler.WEPS_PLUG_MODBUS_TYPE.equals(device.getProduct().getCode())) {
if (Objects.equals(wellStatus, 1)) {
wellStatus = 0;
} else if (Objects.equals(wellStatus, 2)) {
wellStatus = 1;
} else {
wellStatus = null;
}
} else if (PersistenceHandler.MI_WEPS_PLUG_MODBUS_TYPE.equals(device.getProduct().getCode())) {
if (Objects.equals(wellStatus, 0)) {
wellStatus = 0;
} else {
wellStatus = 1;
}
}
return wellStatus;
}
} }

2
src/main/java/com/isu/gaswellwatch/service/DeviceService.java
View File

@ -17,7 +17,7 @@ import java.util.Map;
public interface DeviceService extends IService<Device> { public interface DeviceService extends IService<Device> {
List<GasStationVO> queryGasStationList(Long blockId,String gasStationName); List<GasStationVO> queryGasStationList(String gasStationName);
Page<DeviceVO> page(Integer currentPage, Integer pageSize, String gasWellName, String gasStationName, String mainPipe, Long deviceTypeId, Long blockId, Integer product); Page<DeviceVO> page(Integer currentPage, Integer pageSize, String gasWellName, String gasStationName, String mainPipe, Long deviceTypeId, Long blockId, Integer product);

6
src/main/java/com/isu/gaswellwatch/service/impl/DeviceOptLogServiceImpl.java
View File

@ -48,7 +48,10 @@ public class DeviceOptLogServiceImpl extends ServiceImpl<DeviceOptLogDao, Device
deviceOptLog.setGasStation(deviceVO.getGasStation()); deviceOptLog.setGasStation(deviceVO.getGasStation());
String content = ""; String content = "";
if ("device".equalsIgnoreCase(source)) { if ("device".equalsIgnoreCase(source)) {
content = isOpen == 1 ? "检测到气井开启" : "检测到气井关闭"; content =
isOpen == 1 ? "检测到气井开启" : "检测到气井关闭";
deviceOptLog.setUsername("系统"); deviceOptLog.setUsername("系统");
deviceOptLog.setName("系统"); deviceOptLog.setName("系统");
} else { } else {
@ -65,6 +68,5 @@ public class DeviceOptLogServiceImpl extends ServiceImpl<DeviceOptLogDao, Device
public Page<DeviceOptLog> page(Page<DeviceOptLog> page, Date start, Date end, Long deviceId) { public Page<DeviceOptLog> page(Page<DeviceOptLog> page, Date start, Date end, Long deviceId) {
return this.deviceDao.deviceOptLogPage(page, start, end, deviceId); return this.deviceDao.deviceOptLogPage(page, start, end, deviceId);
} }
} }

22
src/main/java/com/isu/gaswellwatch/service/impl/DeviceServiceImpl.java
View File

@ -19,7 +19,6 @@ import com.isu.gaswellwatch.exception.BusinessException;
import com.isu.gaswellwatch.modbus.data.CacheService; import com.isu.gaswellwatch.modbus.data.CacheService;
import com.isu.gaswellwatch.modbus.data.PersistenceHandler; import com.isu.gaswellwatch.modbus.data.PersistenceHandler;
import com.isu.gaswellwatch.modbus.data.Redis2DBPersistenceService; import com.isu.gaswellwatch.modbus.data.Redis2DBPersistenceService;
import com.isu.gaswellwatch.modbus.data.decode.impl.LocalDateTimeDecodeHandler;
import com.isu.gaswellwatch.service.*; import com.isu.gaswellwatch.service.*;
import com.isu.gaswellwatch.utils.ConverterUtil; import com.isu.gaswellwatch.utils.ConverterUtil;
import com.isu.gaswellwatch.vo.*; import com.isu.gaswellwatch.vo.*;
@ -37,7 +36,6 @@ import java.net.URLEncoder;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.text.ParseException; import java.text.ParseException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.util.*; import java.util.*;
@ -66,8 +64,8 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceDao, Device> implements
private UserService userService; private UserService userService;
@Override @Override
public List<GasStationVO> queryGasStationList(Long blockId, String gasStationName) { public List<GasStationVO> queryGasStationList(String gasStationName) {
List<String> gasStationList = this.deviceDao.queryGasStationList(blockId, gasStationName); List<String> gasStationList = this.deviceDao.queryGasStationList(gasStationName);
if (ObjectUtils.isEmpty(gasStationList)) { if (ObjectUtils.isEmpty(gasStationList)) {
return List.of(); return List.of();
} }
@ -100,7 +98,6 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceDao, Device> implements
Map<String, Dictionary> miWepsPlugStatus = this.dictionaryService.getValueMapByType("miWepsPlugStatus"); Map<String, Dictionary> miWepsPlugStatus = this.dictionaryService.getValueMapByType("miWepsPlugStatus");
try { try {
LocalDateTime now = LocalDateTime.now(), earliestTime = now.minusMinutes(5);
for (DeviceVO deviceVO : deviceVOList) { for (DeviceVO deviceVO : deviceVOList) {
String deviceKey = PersistenceHandler.DEVICE_DATA_CACHE + deviceVO.getId(); String deviceKey = PersistenceHandler.DEVICE_DATA_CACHE + deviceVO.getId();
Object online = this.redisTemplate.opsForHash().get(deviceKey, "online"); Object online = this.redisTemplate.opsForHash().get(deviceKey, "online");
@ -110,15 +107,6 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceDao, Device> implements
continue; continue;
} }
Object collectionTime = this.redisTemplate.opsForHash().get(deviceKey, "collectionTime");
if (Objects.nonNull(collectionTime)) {
LocalDateTime collectionLocalDateTime = LocalDateTime.parse(String.valueOf(collectionTime),
LocalDateTimeDecodeHandler.OUT_FORMATTER);
if (earliestTime.isBefore(collectionLocalDateTime)) {
continue;
}
}
Object casPressure = this.redisTemplate.opsForHash().get(deviceKey, "casPressure"); Object casPressure = this.redisTemplate.opsForHash().get(deviceKey, "casPressure");
deviceVO.setCasPressure(casPressure == null ? "" : casPressure.toString()); deviceVO.setCasPressure(casPressure == null ? "" : casPressure.toString());
@ -150,7 +138,7 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceDao, Device> implements
Dictionary runMode1 = controlModeMap.get(runMode.toString()); Dictionary runMode1 = controlModeMap.get(runMode.toString());
deviceVO.setRunMode(runMode1 == null ? "" : runMode1.getName()); deviceVO.setRunMode(runMode1 == null ? "" : runMode1.getName());
} }
deviceVO.setRunMode("计时器模式"); // ETC运行模式写死 deviceVO.setRunMode(""); // ETC不显示运行模式，点表中没有改点位
} else if (PersistenceHandler.SCSS_MODBUS_TYPE.equalsIgnoreCase(deviceVO.getProduct().getCode())) { } else if (PersistenceHandler.SCSS_MODBUS_TYPE.equalsIgnoreCase(deviceVO.getProduct().getCode())) {
Object gas_status = this.redisTemplate.opsForHash().get(deviceKey, "firstSolenoidStatus"); Object gas_status = this.redisTemplate.opsForHash().get(deviceKey, "firstSolenoidStatus");
deviceVO.setWellStatus(gas_status == null ? "" : gas_status.toString()); deviceVO.setWellStatus(gas_status == null ? "" : gas_status.toString());
@ -208,7 +196,7 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceDao, Device> implements
if (runMode == null) { if (runMode == null) {
deviceVO.setRunMode(""); deviceVO.setRunMode("");
} else { } else {
Dictionary runMode1 = runModeMap.get(runMode.toString()); Dictionary runMode1 = miWepsRunMode.get(runMode.toString());
deviceVO.setRunMode(runMode1 == null ? "" : runMode1.getName()); deviceVO.setRunMode(runMode1 == null ? "" : runMode1.getName());
} }
} }
@ -413,7 +401,7 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceDao, Device> implements
if (CollectionUtil.isNotEmpty(deviceHistoryVO)) { if (CollectionUtil.isNotEmpty(deviceHistoryVO)) {
Map<String, Dictionary> runModeMap = this.dictionaryService.getValueMapByType("runMode"); Map<String, Dictionary> runModeMap = this.dictionaryService.getValueMapByType("runMode");
if (PersistenceHandler.ETC_MODBUS_TYPE.equalsIgnoreCase(device.getProduct().getCode())) { if (PersistenceHandler.ETC_MODBUS_TYPE.equalsIgnoreCase(device.getProduct().getCode())) {
runModeMap = Map.of("1", Dictionary.builder().code("1").name("计时器模式").build()); runModeMap = this.dictionaryService.getValueMapByType("controlMode");
} else if (PersistenceHandler.SCSS_MODBUS_TYPE.equalsIgnoreCase(device.getProduct().getCode())) { } else if (PersistenceHandler.SCSS_MODBUS_TYPE.equalsIgnoreCase(device.getProduct().getCode())) {
runModeMap = this.dictionaryService.getValueMapByType("ctlMode"); runModeMap = this.dictionaryService.getValueMapByType("ctlMode");
} else if (PersistenceHandler.WEPS_PLUG_MODBUS_TYPE.equalsIgnoreCase(device.getProduct().getCode())) { } else if (PersistenceHandler.WEPS_PLUG_MODBUS_TYPE.equalsIgnoreCase(device.getProduct().getCode())) {

9
src/main/java/com/isu/gaswellwatch/vo/DeviceHistoryVO.java
View File

@ -83,11 +83,6 @@ public class DeviceHistoryVO extends Model<DeviceHistoryVO> {
*/ */
private String solarVoltage; private String solarVoltage;
/**
* 电池电压
*/
private String batteryVoltage;
public void setOilPressure(String oilPressure) { public void setOilPressure(String oilPressure) {
this.oilPressure = NumberScaleUtils.formatTwoScalePositiveNumber(oilPressure); this.oilPressure = NumberScaleUtils.formatTwoScalePositiveNumber(oilPressure);
} }
@ -112,8 +107,4 @@ public class DeviceHistoryVO extends Model<DeviceHistoryVO> {
this.solarVoltage = NumberScaleUtils.formatTwoScalePositiveNumber(solarVoltage); this.solarVoltage = NumberScaleUtils.formatTwoScalePositiveNumber(solarVoltage);
} }
public void setBatteryVoltage(String batteryVoltage) {
this.batteryVoltage = NumberScaleUtils.formatTwoScalePositiveNumber(batteryVoltage);
}
} }

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

@ -1,78 +0,0 @@
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`;

86
src/main/resources/KNPC_add_field_20250306.sql
View File

@ -1,86 +0,0 @@
INSERT INTO `command_points` (`id`, `command_id`, `field`, `name`, `details`, `start_address`, `step_size`, `factor`, `precision`, `use_hex`, `byte_order`, `format`, `decode_name`)
VALUES (10055, 10001, 'batteryVoltage', '电池电压', '单位： V, *100', 22, 11, 100.00, 2, NULL, NULL, NULL, 'factor');
-- 77台设备
select concat('ALTER TABLE `t_device_data_', id, '` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT \'电池电压：单位V, *100\' AFTER `humidity`;') add_sql from device where product = 4;
ALTER TABLE `t_device_data_10` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *100' AFTER `humidity`;
ALTER TABLE `t_device_data_224` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *100' AFTER `humidity`;
ALTER TABLE `t_device_data_226` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *100' AFTER `humidity`;
ALTER TABLE `t_device_data_228` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *100' AFTER `humidity`;
ALTER TABLE `t_device_data_229` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *100' AFTER `humidity`;
ALTER TABLE `t_device_data_230` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *100' AFTER `humidity`;
ALTER TABLE `t_device_data_231` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *100' AFTER `humidity`;
ALTER TABLE `t_device_data_240` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *100' AFTER `humidity`;
ALTER TABLE `t_device_data_251` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *100' AFTER `humidity`;
ALTER TABLE `t_device_data_254` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *100' AFTER `humidity`;
ALTER TABLE `t_device_data_264` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *100' AFTER `humidity`;
ALTER TABLE `t_device_data_265` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *100' AFTER `humidity`;
ALTER TABLE `t_device_data_270` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *100' AFTER `humidity`;
ALTER TABLE `t_device_data_274` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *100' AFTER `humidity`;
ALTER TABLE `t_device_data_275` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *100' AFTER `humidity`;
ALTER TABLE `t_device_data_282` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *100' AFTER `humidity`;
ALTER TABLE `t_device_data_284` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *100' AFTER `humidity`;
ALTER TABLE `t_device_data_285` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *100' AFTER `humidity`;
ALTER TABLE `t_device_data_286` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *100' AFTER `humidity`;
ALTER TABLE `t_device_data_287` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *100' AFTER `humidity`;
ALTER TABLE `t_device_data_306` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *100' AFTER `humidity`;
ALTER TABLE `t_device_data_307` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *100' AFTER `humidity`;
ALTER TABLE `t_device_data_308` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *100' AFTER `humidity`;
ALTER TABLE `t_device_data_309` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *100' AFTER `humidity`;
ALTER TABLE `t_device_data_316` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *100' AFTER `humidity`;
ALTER TABLE `t_device_data_335` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *100' AFTER `humidity`;
ALTER TABLE `t_device_data_337` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *100' AFTER `humidity`;
ALTER TABLE `t_device_data_339` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *100' AFTER `humidity`;
ALTER TABLE `t_device_data_342` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *100' AFTER `humidity`;
ALTER TABLE `t_device_data_344` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *100' AFTER `humidity`;
ALTER TABLE `t_device_data_345` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *100' AFTER `humidity`;
ALTER TABLE `t_device_data_346` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *100' AFTER `humidity`;
ALTER TABLE `t_device_data_347` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *100' AFTER `humidity`;
ALTER TABLE `t_device_data_348` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *100' AFTER `humidity`;
ALTER TABLE `t_device_data_353` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *100' AFTER `humidity`;
ALTER TABLE `t_device_data_354` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *100' AFTER `humidity`;
ALTER TABLE `t_device_data_355` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *100' AFTER `humidity`;
ALTER TABLE `t_device_data_356` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *100' AFTER `humidity`;
ALTER TABLE `t_device_data_357` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *100' AFTER `humidity`;
ALTER TABLE `t_device_data_358` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *100' AFTER `humidity`;
ALTER TABLE `t_device_data_359` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *100' AFTER `humidity`;
ALTER TABLE `t_device_data_360` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *100' AFTER `humidity`;
ALTER TABLE `t_device_data_361` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *100' AFTER `humidity`;
ALTER TABLE `t_device_data_362` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *100' AFTER `humidity`;
ALTER TABLE `t_device_data_374` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *100' AFTER `humidity`;
ALTER TABLE `t_device_data_375` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *100' AFTER `humidity`;
ALTER TABLE `t_device_data_376` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *100' AFTER `humidity`;
ALTER TABLE `t_device_data_377` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *100' AFTER `humidity`;
ALTER TABLE `t_device_data_378` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *100' AFTER `humidity`;
ALTER TABLE `t_device_data_379` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *100' AFTER `humidity`;
ALTER TABLE `t_device_data_380` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *100' AFTER `humidity`;
ALTER TABLE `t_device_data_381` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *100' AFTER `humidity`;
ALTER TABLE `t_device_data_382` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *100' AFTER `humidity`;
ALTER TABLE `t_device_data_383` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *100' AFTER `humidity`;
ALTER TABLE `t_device_data_386` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *100' AFTER `humidity`;
ALTER TABLE `t_device_data_387` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *100' AFTER `humidity`;
ALTER TABLE `t_device_data_388` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *100' AFTER `humidity`;
ALTER TABLE `t_device_data_389` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *100' AFTER `humidity`;
ALTER TABLE `t_device_data_390` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *100' AFTER `humidity`;
ALTER TABLE `t_device_data_391` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *100' AFTER `humidity`;
ALTER TABLE `t_device_data_392` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *100' AFTER `humidity`;
ALTER TABLE `t_device_data_393` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *100' AFTER `humidity`;
ALTER TABLE `t_device_data_394` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *100' AFTER `humidity`;
ALTER TABLE `t_device_data_395` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *100' AFTER `humidity`;
ALTER TABLE `t_device_data_398` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *100' AFTER `humidity`;
ALTER TABLE `t_device_data_414` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *100' AFTER `humidity`;
ALTER TABLE `t_device_data_415` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *100' AFTER `humidity`;
ALTER TABLE `t_device_data_416` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *100' AFTER `humidity`;
ALTER TABLE `t_device_data_417` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *100' AFTER `humidity`;
ALTER TABLE `t_device_data_418` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *100' AFTER `humidity`;
ALTER TABLE `t_device_data_427` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *100' AFTER `humidity`;
ALTER TABLE `t_device_data_433` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *100' AFTER `humidity`;
ALTER TABLE `t_device_data_434` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *100' AFTER `humidity`;
ALTER TABLE `t_device_data_435` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *100' AFTER `humidity`;
ALTER TABLE `t_device_data_436` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *100' AFTER `humidity`;
ALTER TABLE `t_device_data_438` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *100' AFTER `humidity`;
ALTER TABLE `t_device_data_889` ADD COLUMN `battery_voltage` decimal(10, 2) NULL COMMENT '电池电压：单位V, *100' AFTER `humidity`;

25
src/main/resources/MI_WEPS_change_20250306.sql
View File

@ -1,25 +0,0 @@
select concat('ALTER TABLE `t_device_data_', id, '` ',
'MODIFY COLUMN `open_pressure` varchar(100) NULL DEFAULT NULL COMMENT \'开井压力 - 单位：MPa\' AFTER `open_time`,',
'MODIFY COLUMN `close_pressure` varchar(100) NULL DEFAULT NULL COMMENT \'关井压力 - 单位：MPa\' AFTER `open_pressure`,',
'MODIFY COLUMN `little_rise_pressure` varchar(100) NULL DEFAULT NULL COMMENT \'微升压力 - 单位：MPa\' AFTER `close_pressure`,',
'MODIFY COLUMN `protection_pressure` varchar(100) NULL DEFAULT NULL COMMENT \'保护压力 - 单位：MPa\' AFTER `reserve2`;') add_sql
from device where product = 29;
ALTER TABLE `t_device_data_51000` MODIFY COLUMN `open_pressure` varchar(100) NULL DEFAULT NULL COMMENT '开井压力 - 单位：MPa' AFTER `open_time`,MODIFY COLUMN `close_pressure` varchar(100) NULL DEFAULT NULL COMMENT '关井压力 - 单位：MPa' AFTER `open_pressure`,MODIFY COLUMN `little_rise_pressure` varchar(100) NULL DEFAULT NULL COMMENT '微升压力 - 单位：MPa' AFTER `close_pressure`,MODIFY COLUMN `protection_pressure` varchar(100) NULL DEFAULT NULL COMMENT '保护压力 - 单位：MPa' AFTER `reserve2`;
ALTER TABLE `t_device_data_51001` MODIFY COLUMN `open_pressure` varchar(100) NULL DEFAULT NULL COMMENT '开井压力 - 单位：MPa' AFTER `open_time`,MODIFY COLUMN `close_pressure` varchar(100) NULL DEFAULT NULL COMMENT '关井压力 - 单位：MPa' AFTER `open_pressure`,MODIFY COLUMN `little_rise_pressure` varchar(100) NULL DEFAULT NULL COMMENT '微升压力 - 单位：MPa' AFTER `close_pressure`,MODIFY COLUMN `protection_pressure` varchar(100) NULL DEFAULT NULL COMMENT '保护压力 - 单位：MPa' AFTER `reserve2`;
ALTER TABLE `t_device_data_51002` MODIFY COLUMN `open_pressure` varchar(100) NULL DEFAULT NULL COMMENT '开井压力 - 单位：MPa' AFTER `open_time`,MODIFY COLUMN `close_pressure` varchar(100) NULL DEFAULT NULL COMMENT '关井压力 - 单位：MPa' AFTER `open_pressure`,MODIFY COLUMN `little_rise_pressure` varchar(100) NULL DEFAULT NULL COMMENT '微升压力 - 单位：MPa' AFTER `close_pressure`,MODIFY COLUMN `protection_pressure` varchar(100) NULL DEFAULT NULL COMMENT '保护压力 - 单位：MPa' AFTER `reserve2`;
ALTER TABLE `t_device_data_51003` MODIFY COLUMN `open_pressure` varchar(100) NULL DEFAULT NULL COMMENT '开井压力 - 单位：MPa' AFTER `open_time`,MODIFY COLUMN `close_pressure` varchar(100) NULL DEFAULT NULL COMMENT '关井压力 - 单位：MPa' AFTER `open_pressure`,MODIFY COLUMN `little_rise_pressure` varchar(100) NULL DEFAULT NULL COMMENT '微升压力 - 单位：MPa' AFTER `close_pressure`,MODIFY COLUMN `protection_pressure` varchar(100) NULL DEFAULT NULL COMMENT '保护压力 - 单位：MPa' AFTER `reserve2`;
ALTER TABLE `t_device_data_51004` MODIFY COLUMN `open_pressure` varchar(100) NULL DEFAULT NULL COMMENT '开井压力 - 单位：MPa' AFTER `open_time`,MODIFY COLUMN `close_pressure` varchar(100) NULL DEFAULT NULL COMMENT '关井压力 - 单位：MPa' AFTER `open_pressure`,MODIFY COLUMN `little_rise_pressure` varchar(100) NULL DEFAULT NULL COMMENT '微升压力 - 单位：MPa' AFTER `close_pressure`,MODIFY COLUMN `protection_pressure` varchar(100) NULL DEFAULT NULL COMMENT '保护压力 - 单位：MPa' AFTER `reserve2`;
ALTER TABLE `t_device_data_51005` MODIFY COLUMN `open_pressure` varchar(100) NULL DEFAULT NULL COMMENT '开井压力 - 单位：MPa' AFTER `open_time`,MODIFY COLUMN `close_pressure` varchar(100) NULL DEFAULT NULL COMMENT '关井压力 - 单位：MPa' AFTER `open_pressure`,MODIFY COLUMN `little_rise_pressure` varchar(100) NULL DEFAULT NULL COMMENT '微升压力 - 单位：MPa' AFTER `close_pressure`,MODIFY COLUMN `protection_pressure` varchar(100) NULL DEFAULT NULL COMMENT '保护压力 - 单位：MPa' AFTER `reserve2`;
ALTER TABLE `t_device_data_51006` MODIFY COLUMN `open_pressure` varchar(100) NULL DEFAULT NULL COMMENT '开井压力 - 单位：MPa' AFTER `open_time`,MODIFY COLUMN `close_pressure` varchar(100) NULL DEFAULT NULL COMMENT '关井压力 - 单位：MPa' AFTER `open_pressure`,MODIFY COLUMN `little_rise_pressure` varchar(100) NULL DEFAULT NULL COMMENT '微升压力 - 单位：MPa' AFTER `close_pressure`,MODIFY COLUMN `protection_pressure` varchar(100) NULL DEFAULT NULL COMMENT '保护压力 - 单位：MPa' AFTER `reserve2`;
ALTER TABLE `t_device_data_51007` MODIFY COLUMN `open_pressure` varchar(100) NULL DEFAULT NULL COMMENT '开井压力 - 单位：MPa' AFTER `open_time`,MODIFY COLUMN `close_pressure` varchar(100) NULL DEFAULT NULL COMMENT '关井压力 - 单位：MPa' AFTER `open_pressure`,MODIFY COLUMN `little_rise_pressure` varchar(100) NULL DEFAULT NULL COMMENT '微升压力 - 单位：MPa' AFTER `close_pressure`,MODIFY COLUMN `protection_pressure` varchar(100) NULL DEFAULT NULL COMMENT '保护压力 - 单位：MPa' AFTER `reserve2`;
ALTER TABLE `t_device_data_51008` MODIFY COLUMN `open_pressure` varchar(100) NULL DEFAULT NULL COMMENT '开井压力 - 单位：MPa' AFTER `open_time`,MODIFY COLUMN `close_pressure` varchar(100) NULL DEFAULT NULL COMMENT '关井压力 - 单位：MPa' AFTER `open_pressure`,MODIFY COLUMN `little_rise_pressure` varchar(100) NULL DEFAULT NULL COMMENT '微升压力 - 单位：MPa' AFTER `close_pressure`,MODIFY COLUMN `protection_pressure` varchar(100) NULL DEFAULT NULL COMMENT '保护压力 - 单位：MPa' AFTER `reserve2`;
ALTER TABLE `t_device_data_51009` MODIFY COLUMN `open_pressure` varchar(100) NULL DEFAULT NULL COMMENT '开井压力 - 单位：MPa' AFTER `open_time`,MODIFY COLUMN `close_pressure` varchar(100) NULL DEFAULT NULL COMMENT '关井压力 - 单位：MPa' AFTER `open_pressure`,MODIFY COLUMN `little_rise_pressure` varchar(100) NULL DEFAULT NULL COMMENT '微升压力 - 单位：MPa' AFTER `close_pressure`,MODIFY COLUMN `protection_pressure` varchar(100) NULL DEFAULT NULL COMMENT '保护压力 - 单位：MPa' AFTER `reserve2`;
ALTER TABLE `t_device_data_51010` MODIFY COLUMN `open_pressure` varchar(100) NULL DEFAULT NULL COMMENT '开井压力 - 单位：MPa' AFTER `open_time`,MODIFY COLUMN `close_pressure` varchar(100) NULL DEFAULT NULL COMMENT '关井压力 - 单位：MPa' AFTER `open_pressure`,MODIFY COLUMN `little_rise_pressure` varchar(100) NULL DEFAULT NULL COMMENT '微升压力 - 单位：MPa' AFTER `close_pressure`,MODIFY COLUMN `protection_pressure` varchar(100) NULL DEFAULT NULL COMMENT '保护压力 - 单位：MPa' AFTER `reserve2`;
ALTER TABLE `t_device_data_51011` MODIFY COLUMN `open_pressure` varchar(100) NULL DEFAULT NULL COMMENT '开井压力 - 单位：MPa' AFTER `open_time`,MODIFY COLUMN `close_pressure` varchar(100) NULL DEFAULT NULL COMMENT '关井压力 - 单位：MPa' AFTER `open_pressure`,MODIFY COLUMN `little_rise_pressure` varchar(100) NULL DEFAULT NULL COMMENT '微升压力 - 单位：MPa' AFTER `close_pressure`,MODIFY COLUMN `protection_pressure` varchar(100) NULL DEFAULT NULL COMMENT '保护压力 - 单位：MPa' AFTER `reserve2`;
ALTER TABLE `t_device_data_51012` MODIFY COLUMN `open_pressure` varchar(100) NULL DEFAULT NULL COMMENT '开井压力 - 单位：MPa' AFTER `open_time`,MODIFY COLUMN `close_pressure` varchar(100) NULL DEFAULT NULL COMMENT '关井压力 - 单位：MPa' AFTER `open_pressure`,MODIFY COLUMN `little_rise_pressure` varchar(100) NULL DEFAULT NULL COMMENT '微升压力 - 单位：MPa' AFTER `close_pressure`,MODIFY COLUMN `protection_pressure` varchar(100) NULL DEFAULT NULL COMMENT '保护压力 - 单位：MPa' AFTER `reserve2`;
ALTER TABLE `t_device_data_51013` MODIFY COLUMN `open_pressure` varchar(100) NULL DEFAULT NULL COMMENT '开井压力 - 单位：MPa' AFTER `open_time`,MODIFY COLUMN `close_pressure` varchar(100) NULL DEFAULT NULL COMMENT '关井压力 - 单位：MPa' AFTER `open_pressure`,MODIFY COLUMN `little_rise_pressure` varchar(100) NULL DEFAULT NULL COMMENT '微升压力 - 单位：MPa' AFTER `close_pressure`,MODIFY COLUMN `protection_pressure` varchar(100) NULL DEFAULT NULL COMMENT '保护压力 - 单位：MPa' AFTER `reserve2`;
ALTER TABLE `t_device_data_51014` MODIFY COLUMN `open_pressure` varchar(100) NULL DEFAULT NULL COMMENT '开井压力 - 单位：MPa' AFTER `open_time`,MODIFY COLUMN `close_pressure` varchar(100) NULL DEFAULT NULL COMMENT '关井压力 - 单位：MPa' AFTER `open_pressure`,MODIFY COLUMN `little_rise_pressure` varchar(100) NULL DEFAULT NULL COMMENT '微升压力 - 单位：MPa' AFTER `close_pressure`,MODIFY COLUMN `protection_pressure` varchar(100) NULL DEFAULT NULL COMMENT '保护压力 - 单位：MPa' AFTER `reserve2`;
ALTER TABLE `t_device_data_51015` MODIFY COLUMN `open_pressure` varchar(100) NULL DEFAULT NULL COMMENT '开井压力 - 单位：MPa' AFTER `open_time`,MODIFY COLUMN `close_pressure` varchar(100) NULL DEFAULT NULL COMMENT '关井压力 - 单位：MPa' AFTER `open_pressure`,MODIFY COLUMN `little_rise_pressure` varchar(100) NULL DEFAULT NULL COMMENT '微升压力 - 单位：MPa' AFTER `close_pressure`,MODIFY COLUMN `protection_pressure` varchar(100) NULL DEFAULT NULL COMMENT '保护压力 - 单位：MPa' AFTER `reserve2`;
ALTER TABLE `t_device_data_51016` MODIFY COLUMN `open_pressure` varchar(100) NULL DEFAULT NULL COMMENT '开井压力 - 单位：MPa' AFTER `open_time`,MODIFY COLUMN `close_pressure` varchar(100) NULL DEFAULT NULL COMMENT '关井压力 - 单位：MPa' AFTER `open_pressure`,MODIFY COLUMN `little_rise_pressure` varchar(100) NULL DEFAULT NULL COMMENT '微升压力 - 单位：MPa' AFTER `close_pressure`,MODIFY COLUMN `protection_pressure` varchar(100) NULL DEFAULT NULL COMMENT '保护压力 - 单位：MPa' AFTER `reserve2`;

21
src/main/resources/mapper/DeviceDao.xml
View File

@ -39,14 +39,7 @@
<select id="queryGasStationList" resultType="string"> <select id="queryGasStationList" resultType="string">
select u.gas_station select u.gas_station
from device u from device u
<where> where u.gas_station LIKE CONCAT('%', #{gasStationName}, '%')
<if test="gasStationName != null">
and u.gas_station LIKE CONCAT('%', #{gasStationName}, '%')
</if>
<if test="blockId != null">
and exists (select 1 from gas_well gw where gw.id = u.gas_well and gw.block_id = #{blockId})
</if>
</where>
order by u.id desc order by u.id desc
</select> </select>
@ -107,13 +100,12 @@
select t.collection_time,t.oil_pressure,t.cas_pressure select t.collection_time,t.oil_pressure,t.cas_pressure
<choose> <choose>
<when test="deviceProduct!=null and deviceProduct=='knpc'"> <when test="deviceProduct!=null and deviceProduct=='knpc'">
,t.pre_pressure,'knpc' as type,t.run_mode,t.status_end_time,t.temperature ,t.pre_pressure,'knpc' as
,t.humidity,t.well_status,t.plug_status, t.battery_voltage type,t.run_mode,t.status_end_time,t.temperature,t.humidity,t.well_status,t.plug_status
</when> </when>
<when test="deviceProduct!=null and deviceProduct=='etc'"> <when test="deviceProduct!=null and deviceProduct=='etc'">
,t.pre_pressure,'etc' as type,t.current_status_remaining_time as statusEndTime ,t.pre_pressure,'etc' as type,t.current_status_remaining_time as statusEndTime
,'1' as runMode,t.solenoid_valve_status as wellStatus ,t.controller_current_status as runMode,t.solenoid_valve_status as wellStatus
,t.battery_voltage
</when> </when>
<when test="deviceProduct!=null and deviceProduct=='scss'"> <when test="deviceProduct!=null and deviceProduct=='scss'">
,t.pre_pressure,'scss' as type,t.ctl_model as runMode,t.remaining_time_action as statusEndTime ,t.pre_pressure,'scss' as type,t.ctl_model as runMode,t.remaining_time_action as statusEndTime
@ -232,13 +224,12 @@
select t.collection_time,t.oil_pressure,t.cas_pressure select t.collection_time,t.oil_pressure,t.cas_pressure
<choose> <choose>
<when test="deviceProduct!=null and deviceProduct=='knpc'"> <when test="deviceProduct!=null and deviceProduct=='knpc'">
,t.pre_pressure,'knpc' as type,t.run_mode,t.status_end_time,t.temperature,t.humidity ,t.pre_pressure,'knpc' as
,t.well_status,t.plug_status,t.battery_voltage type,t.run_mode,t.status_end_time,t.temperature,t.humidity,t.well_status,t.plug_status
</when> </when>
<when test="deviceProduct!=null and deviceProduct=='etc'"> <when test="deviceProduct!=null and deviceProduct=='etc'">
,t.pre_pressure,'etc' as type,t.current_status_remaining_time as statusEndTime ,t.pre_pressure,'etc' as type,t.current_status_remaining_time as statusEndTime
,t.controller_current_status as runMode,t.solenoid_valve_status as wellStatus ,t.controller_current_status as runMode,t.solenoid_valve_status as wellStatus
,t.battery_voltage
</when> </when>
<when test="deviceProduct!=null and deviceProduct=='scss'"> <when test="deviceProduct!=null and deviceProduct=='scss'">
,t.pre_pressure,'scss' as type,t.ctl_model as runMode,t.remaining_time_action as statusEndTime ,t.pre_pressure,'scss' as type,t.ctl_model as runMode,t.remaining_time_action as statusEndTime

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

@ -12,7 +12,6 @@ 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 '关井时间',

87
src/main/resources/sql/CREATE_KNPCV1.sql
View File

@ -1,16 +1,16 @@
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 '接收到数据时间',
`device_time` datetime NULL DEFAULT NULL COMMENT '设备时间。\r\n寄存器地址：3:0000，3:0001，3:0002，3:0003，3:0004，3:0005\r\n', `device_time` datetime NULL DEFAULT NULL COMMENT '设备时间。\r\n寄存器地址：3:0000，3:0001，3:0002，3:0003，3:0004，3:0005\r\n',
`run_mode` smallint NULL DEFAULT NULL COMMENT '运行模式：\r\n0：手动模式 \r\n1：定时器模式 \r\n2：计时器模式 \r\n3：压力模式\r\n4：柱塞模式\r\n5：时压模式', `run_mode` smallint NULL DEFAULT NULL COMMENT '运行模式：\r\n0：手动模式 \r\n1：定时器模式 \r\n2：计时器模式 \r\n3：压力模式\r\n4：柱塞模式\r\n5：时压模式',
`well_status` smallint NULL DEFAULT NULL COMMENT '气井状态：\r\n0：关闭 \r\n1：打开', `well_status` smallint NULL DEFAULT NULL COMMENT '气井状态：\r\n0：关闭 \r\n1：打开',
`plug_status` smallint NULL DEFAULT NULL COMMENT '柱塞状态：\r\n0：离开\r\n1：上升中\r\n2：到达', `plug_status` smallint NULL DEFAULT NULL COMMENT '柱塞状态：\r\n0：离开\r\n1：上升中\r\n2：到达',
`status_start_time` varchar(10) NULL DEFAULT NULL COMMENT '当前状态开始时间', `status_start_time` varchar(10) NULL DEFAULT NULL COMMENT '当前状态开始时间',
`status_end_time` varchar(10) NULL DEFAULT NULL COMMENT '当前状态结束时间', `status_end_time` varchar(10) NULL DEFAULT NULL COMMENT '当前状态结束时间',
`oil_pressure` decimal(10, 2) NULL DEFAULT NULL COMMENT '油压：单位Mpa', `oil_pressure` decimal(10, 2) NULL DEFAULT NULL COMMENT '油压：单位Mpa',
`cas_pressure` decimal(10, 2) NULL DEFAULT NULL COMMENT '套压：单位Mpa', `cas_pressure` decimal(10, 2) NULL DEFAULT NULL COMMENT '套压：单位Mpa',
`pre_pressure` decimal(10, 2) NULL DEFAULT NULL COMMENT '输压：单位Mpa', `pre_pressure` decimal(10, 2) NULL DEFAULT NULL COMMENT '输压：单位Mpa',
@ -18,43 +18,42 @@ CREATE TABLE `$TableName$`
`liquid_level` decimal(10, 2) NULL DEFAULT NULL COMMENT '流量：单位mm', `liquid_level` decimal(10, 2) NULL DEFAULT NULL COMMENT '流量：单位mm',
`temperature` decimal(10, 2) NULL DEFAULT NULL COMMENT '温度：单位℃，*100，最高位表示正负，0正1负，即零下的温度加32768', `temperature` decimal(10, 2) NULL DEFAULT NULL COMMENT '温度：单位℃，*100，最高位表示正负，0正1负，即零下的温度加32768',
`humidity` decimal(10, 2) NULL DEFAULT NULL COMMENT '湿度：单位%', `humidity` decimal(10, 2) NULL DEFAULT NULL COMMENT '湿度：单位%',
`battery_voltage` decimal(10, 2) NULL DEFAULT NULL COMMENT '电池电压：单位V, *100', `op_mode` smallint NULL DEFAULT NULL COMMENT '运行模式：\r\n0： 手动模式 hand_mode\r\n1：定时器模式 timer_mode\r\n2：计时器模式 t2mode\r\n3：压力模式 pressure_mode\r\n4：柱塞模式 piston_mode\r\n5：时压模式 tp_mode',
`op_mode` smallint NULL DEFAULT NULL COMMENT '运行模式：\r\n0： 手动模式 hand_mode\r\n1：定时器模式 timer_mode\r\n2：计时器模式 t2mode\r\n3：压力模式 pressure_mode\r\n4：柱塞模式 piston_mode\r\n5：时压模式 tp_mode', `timer_able1` smallint NULL DEFAULT NULL COMMENT '定时模式定时器1使能：\r\n0：禁止 disable\r\n1：使能 enable',
`timer_able1` smallint NULL DEFAULT NULL COMMENT '定时模式定时器1使能：\r\n0：禁止 disable\r\n1：使能 enable', `timer_able2` smallint NULL DEFAULT NULL COMMENT '定时模式定时器2使能：\r\n0：禁止 disable\r\n1：使能 ',
`timer_able2` smallint NULL DEFAULT NULL COMMENT '定时模式定时器2使能：\r\n0：禁止 disable\r\n1：使能 ', `timer_open1` varchar(10) NULL DEFAULT NULL COMMENT '时0~23：分0~59：秒0~59',
`timer_open1` varchar(10) NULL DEFAULT NULL COMMENT '时0~23：分0~59：秒0~59', `timer_close1` varchar(10) NULL DEFAULT NULL COMMENT '时0~23：分0~59：秒0~59',
`timer_close1` varchar(10) NULL DEFAULT NULL COMMENT '时0~23：分0~59：秒0~59', `timer_open2` varchar(10) NULL DEFAULT NULL COMMENT '时0~23：分0~59：秒0~59',
`timer_open2` varchar(10) NULL DEFAULT NULL COMMENT '时0~23：分0~59：秒0~59', `timer_close2` varchar(10) NULL DEFAULT NULL COMMENT '时0~23：分0~59：秒0~59',
`timer_close2` varchar(10) NULL DEFAULT NULL COMMENT '时0~23：分0~59：秒0~59', `timing_open` varchar(10) NULL DEFAULT NULL COMMENT '时0~23：分0~59：秒0~59',
`timing_open` varchar(10) NULL DEFAULT NULL COMMENT '时0~23：分0~59：秒0~59', `timing_close` varchar(10) NULL DEFAULT NULL COMMENT '时0~23：分0~59：秒0~59',
`timing_close` varchar(10) NULL DEFAULT NULL COMMENT '时0~23：分0~59：秒0~59', `timing_delay` varchar(10) NULL DEFAULT NULL COMMENT '时0~23：分0~59：秒0~59',
`timing_delay` varchar(10) NULL DEFAULT NULL COMMENT '时0~23：分0~59：秒0~59', `presource` smallint NULL DEFAULT NULL COMMENT '触发压力源：\r\n0：油压 oil_pressure\r\n1：套压 cas_pressure\r\n2：输压 pre_pressure\r\n3：差压 diff_pressure',
`presource` smallint NULL DEFAULT NULL COMMENT '触发压力源：\r\n0：油压 oil_pressure\r\n1：套压 cas_pressure\r\n2：输压 pre_pressure\r\n3：差压 diff_pressure',
`pressure_open` decimal(10, 2) NULL DEFAULT NULL COMMENT '开井压力：单位Mpa，*100', `pressure_open` decimal(10, 2) NULL DEFAULT NULL COMMENT '开井压力：单位Mpa，*100',
`pressure_close` decimal(10, 2) NULL DEFAULT NULL COMMENT '关井压力： 单位Mpa，*100', `pressure_close` decimal(10, 2) NULL DEFAULT NULL COMMENT '关井压力： 单位Mpa，*100',
`trigger_type` smallint NULL DEFAULT NULL COMMENT '压力触发类型：\n0：大于开井压力开井、小于关井压力关井 gre_less\n1：大于开井压力开井、大于关井压力关井 gre_gre\n2：小于开井压力开井、小于关井压力关井 less_less\n3：小于开井压力开井、大于关井压力关井 less_gre', `trigger_type` smallint NULL DEFAULT NULL COMMENT '压力触发类型：\n0：大于开井压力开井、小于关井压力关井 gre_less\n1：大于开井压力开井、大于关井压力关井 gre_gre\n2：小于开井压力开井、小于关井压力关井 less_less\n3：小于开井压力开井、大于关井压力关井 less_gre',
`stability_time` int NULL DEFAULT NULL COMMENT '传感器压力稳定时间：秒', `stability_time` int NULL DEFAULT NULL COMMENT '传感器压力稳定时间：秒',
`max_open_well` varchar(10) NULL DEFAULT NULL COMMENT '时0~999：分0~59：秒0~59', `max_open_well` varchar(10) NULL DEFAULT NULL COMMENT '时0~999：分0~59：秒0~59',
`max_close_well` varchar(10) NULL DEFAULT NULL COMMENT '时0~999：分0~59：秒0~59', `max_close_well` varchar(10) NULL DEFAULT NULL COMMENT '时0~999：分0~59：秒0~59',
`min_open_well` varchar(10) NULL DEFAULT NULL COMMENT '时0~999：分0~59：秒0~59', `min_open_well` varchar(10) NULL DEFAULT NULL COMMENT '时0~999：分0~59：秒0~59',
`min_close_well` varchar(10) NULL DEFAULT NULL COMMENT '时0~999：分0~59：秒0~59', `min_close_well` varchar(10) NULL DEFAULT NULL COMMENT '时0~999：分0~59：秒0~59',
`prespro_tect` smallint NULL DEFAULT NULL COMMENT '开井压力保护使能：\r\n0：禁止 disable\r\n1：使能 enable', `prespro_tect` smallint NULL DEFAULT NULL COMMENT '开井压力保护使能：\r\n0：禁止 disable\r\n1：使能 enable',
`prespro_source` smallint NULL DEFAULT NULL COMMENT '开井压力保护源：\r\n0：油压 oil_pressure\r\n1：套压 cas_pressure\r\n2：输压 pre_pressure\r\n3：差压 diff_pressure', `prespro_source` smallint NULL DEFAULT NULL COMMENT '开井压力保护源：\r\n0：油压 oil_pressure\r\n1：套压 cas_pressure\r\n2：输压 pre_pressure\r\n3：差压 diff_pressure',
`open_well_limit_max` decimal(10, 2) NULL DEFAULT NULL COMMENT '开井压力限制上限：单位MPa *100', `open_well_limit_max` decimal(10, 2) NULL DEFAULT NULL COMMENT '开井压力限制上限：单位MPa *100',
`open_well_limit_min` decimal(10, 2) NULL DEFAULT NULL COMMENT '开井压力限制下限：单位MPa *100', `open_well_limit_min` decimal(10, 2) NULL DEFAULT NULL COMMENT '开井压力限制下限：单位MPa *100',
`plug_init_status` smallint NULL DEFAULT NULL COMMENT '柱塞模式初始气井状态：\r\n0：关井 close_well\r\n1：开井 open_well', `plug_init_status` smallint NULL DEFAULT NULL COMMENT '柱塞模式初始气井状态：\r\n0：关井 close_well\r\n1：开井 open_well',
`plug_sustain_time` varchar(10) NULL DEFAULT NULL COMMENT '时0~999：分0~59：秒0~59', `plug_sustain_time` varchar(10) NULL DEFAULT NULL COMMENT '时0~999：分0~59：秒0~59',
`plug_close_time` varchar(10) NULL DEFAULT NULL COMMENT '时0~999：分0~59：秒0~59', `plug_close_time` varchar(10) NULL DEFAULT NULL COMMENT '时0~999：分0~59：秒0~59',
`tp_init_status` smallint NULL DEFAULT NULL COMMENT '时压模式初始气井状态：\r\n0：关井 close_well\r\n1：开井 open_well', `tp_init_status` smallint NULL DEFAULT NULL COMMENT '时压模式初始气井状态：\r\n0：关井 close_well\r\n1：开井 open_well',
`tp_open_source` smallint NULL DEFAULT NULL COMMENT '时压模式开井源：\r\n0：油压 oil_pressure\r\n1：套压 cas_pressure\r\n2：输压 pre_pressure\r\n3：差压 diff_pressure\r\n4：时间 time_pressure', `tp_open_source` smallint NULL DEFAULT NULL COMMENT '时压模式开井源：\r\n0：油压 oil_pressure\r\n1：套压 cas_pressure\r\n2：输压 pre_pressure\r\n3：差压 diff_pressure\r\n4：时间 time_pressure',
`tp_open_trigger` smallint NULL DEFAULT NULL COMMENT '时压模式开井压力触发模式：\r\n0：大于压力触发\r\n1：小于压力触发', `tp_open_trigger` smallint NULL DEFAULT NULL COMMENT '时压模式开井压力触发模式：\r\n0：大于压力触发\r\n1：小于压力触发',
`tp_open_pressure` smallint NULL DEFAULT NULL COMMENT '时压模式开井压力', `tp_open_pressure` smallint NULL DEFAULT NULL COMMENT '时压模式开井压力',
`tp_open_time` varchar(10) NULL DEFAULT NULL COMMENT '时0~999：分0~59：秒0~59', `tp_open_time` varchar(10) NULL DEFAULT NULL COMMENT '时0~999：分0~59：秒0~59',
`tp_close_source` smallint NULL DEFAULT NULL COMMENT '时压模式关井源：\r\n0：油压 oil_pressure\r\n1：套压 cas_pressure\r\n2：输压 pre_pressure\r\n3：差压 diff_pressure\r\n4：时间 time_pressure', `tp_close_source` smallint NULL DEFAULT NULL COMMENT '时压模式关井源：\r\n0：油压 oil_pressure\r\n1：套压 cas_pressure\r\n2：输压 pre_pressure\r\n3：差压 diff_pressure\r\n4：时间 time_pressure',
`tp_close_trigger` smallint NULL DEFAULT NULL COMMENT '时压模式关井压力触发模式：\r\n0：大于压力触发 max_pressure\r\n1：小于压力触发 min_pressure', `tp_close_trigger` smallint NULL DEFAULT NULL COMMENT '时压模式关井压力触发模式：\r\n0：大于压力触发 max_pressure\r\n1：小于压力触发 min_pressure',
`tp_close_pressure` smallint NULL DEFAULT NULL COMMENT '时压模式关井压力', `tp_close_pressure` smallint NULL DEFAULT NULL COMMENT '时压模式关井压力',
`tp_close_time` varchar(10) NULL DEFAULT NULL COMMENT '时0~999：分0~59：秒0~59', `tp_close_time` varchar(10) NULL DEFAULT NULL COMMENT '时0~999：分0~59：秒0~59',
`tp_stability_time` smallint NULL DEFAULT NULL COMMENT '时压模式压力稳定时长：秒', `tp_stability_time` smallint 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 = 'KNPC设备ID：$DeviceId$的采集数据' ) ENGINE = InnoDB COMMENT = 'KNPC设备ID：$DeviceId$的采集数据'

4
src/main/resources/sql/CREATE_MI_WEPS_PLUG.sql
View File

@ -53,9 +53,9 @@ CREATE TABLE `$TableName$`
`not_reached_flow_time` varchar(20) NULL DEFAULT NULL COMMENT '未到续流时间 - 单位：秒', `not_reached_flow_time` varchar(20) NULL DEFAULT NULL COMMENT '未到续流时间 - 单位：秒',
`close_time` varchar(20) NULL DEFAULT NULL COMMENT '关井时间 - 单位：秒', `close_time` varchar(20) NULL DEFAULT NULL COMMENT '关井时间 - 单位：秒',
`open_time` varchar(20) NULL DEFAULT NULL COMMENT '开井时间 - 单位：秒', `open_time` varchar(20) NULL DEFAULT NULL COMMENT '开井时间 - 单位：秒',
`open_pressure` varchar(100) NULL DEFAULT NULL COMMENT '开井压力 - 单位：MPa', `open_pressure` decimal(12, 4) NULL DEFAULT NULL COMMENT '开井压力 - 单位：MPa',
`close_pressure` decimal(12, 4) NULL DEFAULT NULL COMMENT '关井压力 - 单位：MPa', `close_pressure` decimal(12, 4) NULL DEFAULT NULL COMMENT '关井压力 - 单位：MPa',
`little_rise_pressure` varchar(100) NULL DEFAULT NULL COMMENT '微升压力 - 单位：MPa', `little_rise_pressure` decimal(12, 4) NULL DEFAULT NULL COMMENT '微升压力 - 单位：MPa',
`gas_collection_mode` int NULL DEFAULT NULL COMMENT '集气模式 - 0：低压集气模式；1：高压集气模式', `gas_collection_mode` int NULL DEFAULT NULL COMMENT '集气模式 - 0：低压集气模式；1：高压集气模式',
`reserve2` int NULL DEFAULT NULL COMMENT '保留', `reserve2` int NULL DEFAULT NULL COMMENT '保留',
`protection_pressure` decimal(12, 4) NULL DEFAULT NULL COMMENT '保护压力 - 单位：MPa', `protection_pressure` decimal(12, 4) NULL DEFAULT NULL COMMENT '保护压力 - 单位：MPa',

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`, `battery_voltage`) `open_reset_tub_pressure`, `open_tub_pressure_stable_time`, `pre_pressure`)
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,7 +18,6 @@ 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),

108
src/main/resources/sql/INSERT_KNPCV1.sql
View File

@ -9,58 +9,56 @@ INSERT INTO `$TableName$` (`id`, `device_id`, `created_time`, `collection_time`,
`open_well_limit_max`, `open_well_limit_min`, `plug_init_status`, `plug_sustain_time`, `open_well_limit_max`, `open_well_limit_min`, `plug_init_status`, `plug_sustain_time`,
`plug_close_time`, `tp_init_status`, `tp_open_source`, `tp_open_trigger`, `plug_close_time`, `tp_init_status`, `tp_open_source`, `tp_open_trigger`,
`tp_open_pressure`, `tp_open_time`, `tp_close_source`, `tp_close_trigger`, `tp_open_pressure`, `tp_open_time`, `tp_close_source`, `tp_close_trigger`,
`tp_close_pressure`, `tp_close_time`, `tp_stability_time`, `battery_voltage`) `tp_close_pressure`, `tp_close_time`, `tp_stability_time`)
VALUES (?, ?, NOW(), ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, VALUES (?, ?, NOW(), ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,
?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON DUPLICATE KEY ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
UPDATE receive_time= ON DUPLICATE KEY UPDATE receive_time=VALUES(receive_time),
VALUES (receive_time), device_time= device_time=VALUES(device_time),
VALUES (device_time), run_mode= run_mode=VALUES(run_mode),
VALUES (run_mode), well_status= well_status=VALUES(well_status),
VALUES (well_status), plug_status= plug_status=VALUES(plug_status),
VALUES (plug_status), status_start_time= status_start_time=VALUES(status_start_time),
VALUES (status_start_time), status_end_time= status_end_time=VALUES(status_end_time),
VALUES (status_end_time), oil_pressure= oil_pressure=VALUES(oil_pressure),
VALUES (oil_pressure), cas_pressure= cas_pressure=VALUES(cas_pressure),
VALUES (cas_pressure), pre_pressure= pre_pressure=VALUES(pre_pressure),
VALUES (pre_pressure), pipe_pressure= pipe_pressure=VALUES(pipe_pressure),
VALUES (pipe_pressure), liquid_level= liquid_level=VALUES(liquid_level),
VALUES (liquid_level), temperature= temperature=VALUES(temperature),
VALUES (temperature), humidity= humidity=VALUES(humidity),
VALUES (humidity), battery_voltage= op_mode=VALUES(op_mode),
VALUES (battery_voltage), op_mode= timer_able1=VALUES(timer_able1),
VALUES (op_mode), timer_able1= timer_able2=VALUES(timer_able2),
VALUES (timer_able1), timer_able2= timer_open1=VALUES(timer_open1),
VALUES (timer_able2), timer_open1= timer_close1=VALUES(timer_close1),
VALUES (timer_open1), timer_close1= timer_open2=VALUES(timer_open2),
VALUES (timer_close1), timer_open2= timer_close2=VALUES(timer_close2),
VALUES (timer_open2), timer_close2= timing_open=VALUES(timing_open),
VALUES (timer_close2), timing_open= timing_close=VALUES(timing_close),
VALUES (timing_open), timing_close= timing_delay=VALUES(timing_delay),
VALUES (timing_close), timing_delay= presource=VALUES(presource),
VALUES (timing_delay), presource= pressure_open=VALUES(pressure_open),
VALUES (presource), pressure_open= pressure_close=VALUES(pressure_close),
VALUES (pressure_open), pressure_close= trigger_type=VALUES(trigger_type),
VALUES (pressure_close), trigger_type= stability_time=VALUES(stability_time),
VALUES (trigger_type), stability_time= max_open_well=VALUES(max_open_well),
VALUES (stability_time), max_open_well= max_close_well=VALUES(max_close_well),
VALUES (max_open_well), max_close_well= min_open_well=VALUES(min_open_well),
VALUES (max_close_well), min_open_well= min_close_well=VALUES(min_close_well),
VALUES (min_open_well), min_close_well= prespro_tect=VALUES(prespro_tect),
VALUES (min_close_well), prespro_tect= prespro_source=VALUES(prespro_source),
VALUES (prespro_tect), prespro_source= open_well_limit_max=VALUES(open_well_limit_max),
VALUES (prespro_source), open_well_limit_max= open_well_limit_min=VALUES(open_well_limit_min),
VALUES (open_well_limit_max), open_well_limit_min= plug_init_status=VALUES(plug_init_status),
VALUES (open_well_limit_min), plug_init_status= plug_sustain_time=VALUES(plug_sustain_time),
VALUES (plug_init_status), plug_sustain_time= plug_close_time=VALUES(plug_close_time),
VALUES (plug_sustain_time), plug_close_time= tp_init_status=VALUES(tp_init_status),
VALUES (plug_close_time), tp_init_status= tp_open_source=VALUES(tp_open_source),
VALUES (tp_init_status), tp_open_source= tp_open_trigger=VALUES(tp_open_trigger),
VALUES (tp_open_source), tp_open_trigger= tp_open_pressure=VALUES(tp_open_pressure),
VALUES (tp_open_trigger), tp_open_pressure= tp_open_time=VALUES(tp_open_time),
VALUES (tp_open_pressure), tp_open_time= tp_close_source=VALUES(tp_close_source),
VALUES (tp_open_time), tp_close_source= tp_close_trigger=VALUES(tp_close_trigger),
VALUES (tp_close_source), tp_close_trigger= tp_close_pressure=VALUES(tp_close_pressure),
VALUES (tp_close_trigger), tp_close_pressure= tp_close_time=VALUES(tp_close_time),
VALUES (tp_close_pressure), tp_close_time= tp_stability_time=VALUES(tp_stability_time)
VALUES (tp_close_time), tp_stability_time=
VALUES (tp_stability_time)