Compare commits

...

10 Commits

Author SHA1 Message Date
wangshilong c7cbaef9cb 运行模式处理 2025-03-13 22:36:05 +08:00
wangshilong 38721b0189 解除集气站查询limit限制;设备列表数据部展示5分钟之前的采集数据 2025-03-12 15:42:41 +08:00
wangshilong c09c63313f 添加空值过滤 2025-03-07 21:02:19 +08:00
wangshilong f3e6002e17 非必填 2025-03-07 18:09:38 +08:00
wangshilong b1df896107 增加区块查询过滤;增加维尔普斯气井状态检查逻辑 2025-03-07 17:48:01 +08:00
wangshilong d2c050780b ETC写死计时器模式 2025-03-07 00:50:11 +08:00
wangshilong 4ff1723f65 MI威尔普斯指令调试 2025-03-06 23:39:43 +08:00
wangshilong e579a47a10 knpc、etc添加电压字段查询返回;mi威尔普斯openPressure、littleRisePressure数据插入错误问题 2025-03-06 21:05:41 +08:00
wangshilong 0a7a96e637 ETC添加电压字段 2025-03-06 20:31:03 +08:00
wangshilong d56fe465d7 knpc添加电压字段 2025-03-06 20:25:30 +08:00
20 changed files with 388 additions and 141 deletions

View File

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

View File

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

View File

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

View File

@ -29,6 +29,7 @@ public class EtcPersistenceHandler extends AbstractPersistenceHandler {
ETC_COLUMN_MAPPING_MAP.put("cas_pressure", "casPressure");
ETC_COLUMN_MAPPING_MAP.put("oil_pressure", "oilPressure");
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("arrival_sensor_delay_time", "arrivalSensorDelayTime");
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, 31, "openTubPressureStableTime", Types.VARCHAR);
EtcPersistenceHandler.this.setValue(ps, newRow, 32, "prePressure", Types.DECIMAL);
EtcPersistenceHandler.this.setValue(ps, newRow, 33, "batteryVoltage", Types.DECIMAL);
return ps.executeUpdate();
}
});

View File

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

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, 51, "closeTime", Types.VARCHAR);
MiWepsPlugPersistenceHandler.this.setValue(ps, newRow, 52, "openTime", Types.VARCHAR);
MiWepsPlugPersistenceHandler.this.setValue(ps, newRow, 53, "openPressure", Types.DECIMAL);
MiWepsPlugPersistenceHandler.this.setValue(ps, newRow, 53, "openPressure", Types.VARCHAR);
MiWepsPlugPersistenceHandler.this.setValue(ps, newRow, 54, "closePressure", Types.DECIMAL);
MiWepsPlugPersistenceHandler.this.setValue(ps, newRow, 55, "littleRisePressure", Types.DECIMAL);
MiWepsPlugPersistenceHandler.this.setValue(ps, newRow, 55, "littleRisePressure", Types.VARCHAR);
MiWepsPlugPersistenceHandler.this.setValue(ps, newRow, 56, "gasCollectionMode", Types.INTEGER);
MiWepsPlugPersistenceHandler.this.setValue(ps, newRow, 57, "reserve2", Types.INTEGER);
MiWepsPlugPersistenceHandler.this.setValue(ps, newRow, 58, "protectionPressure", Types.DECIMAL);

View File

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

View File

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

View File

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

View File

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

View File

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

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`;

View File

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

View File

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

View File

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

View File

@ -12,6 +12,7 @@ CREATE TABLE `$TableName$`
`cas_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 '输压',
`battery_voltage` decimal(10, 2) NULL DEFAULT NULL COMMENT '电池电压单位V, *10',
`plunger_rise_time` varchar(10) NULL DEFAULT NULL COMMENT '柱塞上升时间',
`arrival_sensor_delay_time` varchar(10) NULL DEFAULT NULL COMMENT '到达传感器延时时间',
`well_shut_in_time` varchar(10) NULL DEFAULT NULL COMMENT '关井时间',

View File

@ -1,16 +1,16 @@
CREATE TABLE `$TableName$`
(
`id` bigint NOT NULL COMMENT '主键',
`device_id` int NOT NULL COMMENT '设备标识',
`created_time` datetime NOT NULL COMMENT '数据落库时间',
`collection_time` datetime NOT NULL COMMENT '采集指令下发时间',
`receive_time` datetime NOT NULL COMMENT '接收到数据时间',
`device_time` datetime NULL DEFAULT NULL COMMENT '设备时间。\r\n寄存器地址3:00003:00013:00023:00033:00043:0005\r\n',
`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打开',
`plug_status` smallint NULL DEFAULT NULL COMMENT '柱塞状态:\r\n0离开\r\n1上升中\r\n2到达',
`status_start_time` varchar(10) NULL DEFAULT NULL COMMENT '当前状态开始时间',
`status_end_time` varchar(10) NULL DEFAULT NULL COMMENT '当前状态结束时间',
`id` bigint NOT NULL COMMENT '主键',
`device_id` int NOT NULL COMMENT '设备标识',
`created_time` datetime NOT NULL COMMENT '数据落库时间',
`collection_time` datetime NOT NULL COMMENT '采集指令下发时间',
`receive_time` datetime NOT NULL COMMENT '接收到数据时间',
`device_time` datetime NULL DEFAULT NULL COMMENT '设备时间。\r\n寄存器地址3:00003:00013:00023:00033:00043:0005\r\n',
`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打开',
`plug_status` smallint NULL DEFAULT NULL COMMENT '柱塞状态:\r\n0离开\r\n1上升中\r\n2到达',
`status_start_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',
`cas_pressure` decimal(10, 2) NULL DEFAULT NULL COMMENT '套压单位Mpa',
`pre_pressure` decimal(10, 2) NULL DEFAULT NULL COMMENT '输压单位Mpa',
@ -18,42 +18,43 @@ CREATE TABLE `$TableName$`
`liquid_level` decimal(10, 2) NULL DEFAULT NULL COMMENT '流量单位mm',
`temperature` decimal(10, 2) NULL DEFAULT NULL COMMENT '温度:单位℃,*100最高位表示正负0正1负即零下的温度加32768',
`humidity` decimal(10, 2) NULL DEFAULT NULL COMMENT '湿度:单位%',
`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_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_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_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_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',
`presource` smallint NULL DEFAULT NULL COMMENT '触发压力源:\r\n0油压 oil_pressure\r\n1套压 cas_pressure\r\n2输压 pre_pressure\r\n3差压 diff_pressure',
`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',
`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_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_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',
`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_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',
`pressure_open` 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',
`stability_time` int NULL DEFAULT NULL COMMENT '传感器压力稳定时间:秒',
`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',
`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',
`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',
`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 '传感器压力稳定时间:秒',
`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',
`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',
`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',
`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',
`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_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_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_pressure` smallint NULL DEFAULT NULL COMMENT '时压模式开井压力',
`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_trigger` smallint NULL DEFAULT NULL COMMENT '时压模式关井压力触发模式:\r\n0大于压力触发 max_pressure\r\n1小于压力触发 min_pressure',
`tp_close_pressure` smallint NULL DEFAULT NULL COMMENT '时压模式关井压力',
`tp_close_time` varchar(10) NULL DEFAULT NULL COMMENT '时0~999分0~59秒0~59',
`tp_stability_time` smallint NULL DEFAULT NULL COMMENT '时压模式压力稳定时长:秒',
`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_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_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_pressure` smallint NULL DEFAULT NULL COMMENT '时压模式开井压力',
`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_trigger` smallint NULL DEFAULT NULL COMMENT '时压模式关井压力触发模式:\r\n0大于压力触发 max_pressure\r\n1小于压力触发 min_pressure',
`tp_close_pressure` smallint NULL DEFAULT NULL COMMENT '时压模式关井压力',
`tp_close_time` varchar(10) NULL DEFAULT NULL COMMENT '时0~999分0~59秒0~59',
`tp_stability_time` smallint NULL DEFAULT NULL COMMENT '时压模式压力稳定时长:秒',
PRIMARY KEY (`id`) USING BTREE,
UNIQUE INDEX `udx_device_create_time` (`device_id` ASC, `collection_time` ASC) USING BTREE COMMENT '设备采集数据唯一键'
) ENGINE = InnoDB COMMENT = 'KNPC设备ID$DeviceId$的采集数据'

View File

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

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`,
`close_cas_pressure`, `close_trip_cas_pressure`, `close_cas_pressure_stable_time`,
`tub_pressure_switch`, `tub_pressure_sensor_range`, `open_tub_pressure`,
`open_reset_tub_pressure`, `open_tub_pressure_stable_time`, `pre_pressure`)
VALUES (?, ?, NOW(), ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
`open_reset_tub_pressure`, `open_tub_pressure_stable_time`, `pre_pressure`, `battery_voltage`)
VALUES (?, ?, NOW(), ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
ON DUPLICATE KEY UPDATE receive_time=VALUES(receive_time),
solenoid_valve_status=VALUES(solenoid_valve_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),
oil_pressure=VALUES(oil_pressure),
pre_pressure=VALUES(pre_pressure),
battery_voltage=VALUES(battery_voltage),
plunger_rise_time=VALUES(plunger_rise_time),
arrival_sensor_delay_time=VALUES(arrival_sensor_delay_time),
well_shut_in_time=VALUES(well_shut_in_time),

View File

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