From 97299bee618db1fe048d3b32987ea479060813e8 Mon Sep 17 00:00:00 2001 From: wangshilong Date: Wed, 19 Feb 2025 14:56:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=A8=81=E5=B0=94=E6=99=AE?= =?UTF-8?q?=E6=96=AF=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/change_20250217.sql | 110 ++++++++++++++++++++++++ src/main/resources/mapper/DeviceDao.xml | 104 +++++++++++++--------- 2 files changed, 175 insertions(+), 39 deletions(-) create mode 100644 src/main/resources/change_20250217.sql diff --git a/src/main/resources/change_20250217.sql b/src/main/resources/change_20250217.sql new file mode 100644 index 0000000..956c043 --- /dev/null +++ b/src/main/resources/change_20250217.sql @@ -0,0 +1,110 @@ +INSERT INTO `dictionary` (`id`, `type`, `code`, `name`, `value`, `sort`, `create_time`, `update_time`) +VALUES (28, 'deviceProduct', 'weps_plug', '维尔普斯', '4', 4, now(), now()); + +INSERT INTO `commands` (`id`, `ref_type`, `ref_id`, `name`, `code`, `type`, `collection_frequency`, `command`, + `start_address`, `message_length`, `details`) +VALUES (10300, 'DEVICE_PRODUCT_CODE', 28, '采集柱塞模式数据', 'READ_DATA', 'COLLECTION', 30, '010300320020', 32, 138, + '(新版)维尔普斯控制器柱塞模式数据全量采集'); + +INSERT INTO `command_points` (`id`, `command_id`, `field`, `name`, `details`, `start_address`, `step_size`, `factor`, + `precision`, `format`, `decode_name`) +VALUES (13000, 10300, 'casPressure', '套压', 'MPa；-3表示现场仪表通信故障', 50, 1, 100.00, 2, NULL, 'factor'); +INSERT INTO `command_points` (`id`, `command_id`, `field`, `name`, `details`, `start_address`, `step_size`, `factor`, + `precision`, `format`, `decode_name`) +VALUES (13001, 10300, 'oilPressure', '油压', 'MPa；-3表示现场仪表通信故障', 51, 1, 100.00, 2, NULL, 'factor'); +INSERT INTO `command_points` (`id`, `command_id`, `field`, `name`, `details`, `start_address`, `step_size`, `factor`, + `precision`, `format`, `decode_name`) +VALUES (13002, 10300, 'alarm', '报警信息', '1高压集气压力低2低压集气压力高3是柱塞危险上升4 柱塞快速上升次数超过设定值', + 52, 1, NULL, NULL, NULL, NULL); +INSERT INTO `command_points` (`id`, `command_id`, `field`, `name`, `details`, `start_address`, `step_size`, `factor`, + `precision`, `format`, `decode_name`) +VALUES (13003, 10300, 'solenoidValveStatus', '电磁阀状态', '0-未知；1-关状态；2-开状态；', 53, 1, NULL, NULL, NULL, NULL); +INSERT INTO `command_points` (`id`, `command_id`, `field`, `name`, `details`, `start_address`, `step_size`, `factor`, + `precision`, `format`, `decode_name`) +VALUES (13004, 10300, 'openWellRemainingTime', '定时开井剩余时间', '分钟', 54, 1, NULL, NULL, NULL, 'minuteLocalTime'); +INSERT INTO `command_points` (`id`, `command_id`, `field`, `name`, `details`, `start_address`, `step_size`, `factor`, + `precision`, `format`, `decode_name`) +VALUES (13005, 10300, 'closeWellRemainingTime', '定时关井剩余时间', '分钟', 55, 1, NULL, NULL, NULL, 'minuteLocalTime'); +INSERT INTO `command_points` (`id`, `command_id`, `field`, `name`, `details`, `start_address`, `step_size`, `factor`, + `precision`, `format`, `decode_name`) +VALUES (13006, 10300, 'plugArrivalStatus', '柱塞到达信号', '0-未到达；1-到达；', 56, 1, NULL, NULL, NULL, NULL); +INSERT INTO `command_points` (`id`, `command_id`, `field`, `name`, `details`, `start_address`, `step_size`, `factor`, + `precision`, `format`, `decode_name`) +VALUES (13007, 10300, 'plugTooFastCount', '柱塞过快次数', '次', 57, 1, NULL, NULL, NULL, NULL); +INSERT INTO `command_points` (`id`, `command_id`, `field`, `name`, `details`, `start_address`, `step_size`, `factor`, + `precision`, `format`, `decode_name`) +VALUES (13008, 10300, 'plugRisingSpeed', '柱塞上升速度', '米/分钟', 58, 1, NULL, NULL, NULL, NULL); +INSERT INTO `command_points` (`id`, `command_id`, `field`, `name`, `details`, `start_address`, `step_size`, `factor`, + `precision`, `format`, `decode_name`) +VALUES (13009, 10300, 'downstreamPressure', '阀后压力', 'MPa；-3表示现场仪表通信故障', 59, 1, 100.00, 2, NULL, 'factor'); +INSERT INTO `command_points` (`id`, `command_id`, `field`, `name`, `details`, `start_address`, `step_size`, `factor`, + `precision`, `format`, `decode_name`) +VALUES (13010, 10300, 'solenoidValveOpening', '电控阀阀门开度', '%；保留1位小数；开度范围0~100%', 60, 1, 10.00, 1, NULL, + 'factor'); +INSERT INTO `command_points` (`id`, `command_id`, `field`, `name`, `details`, `start_address`, `step_size`, `factor`, + `precision`, `format`, `decode_name`) +VALUES (13011, 10300, 'reserve', '预留', NULL, 61, 1, NULL, NULL, NULL, NULL); +INSERT INTO `command_points` (`id`, `command_id`, `field`, `name`, `details`, `start_address`, `step_size`, `factor`, + `precision`, `format`, `decode_name`) +VALUES (13012, 10300, 'prePressure', '柱塞外输压力', 'MPa；-3表示现场仪表通信故障', 62, 1, 100.00, 2, NULL, 'factor'); +INSERT INTO `command_points` (`id`, `command_id`, `field`, `name`, `details`, `start_address`, `step_size`, `factor`, + `precision`, `format`, `decode_name`) +VALUES (13013, 10300, 'runMode', '运行制度', '0-未知；1-定时开关井；2-压力优化微升；3-自动优化；', 63, 1, NULL, NULL, NULL, + NULL); +INSERT INTO `command_points` (`id`, `command_id`, `field`, `name`, `details`, `start_address`, `step_size`, `factor`, + `precision`, `format`, `decode_name`) +VALUES (13014, 10300, 'wellStatus', '开关井控制', '0-初始值；1-开井；2-关井；', 64, 1, NULL, NULL, NULL, NULL); +INSERT INTO `command_points` (`id`, `command_id`, `field`, `name`, `details`, `start_address`, `step_size`, `factor`, + `precision`, `format`, `decode_name`) +VALUES (13015, 10300, 'gasCollectionMethod', '集气方式', '1-高压集气；2-低压集气；', 65, 1, NULL, NULL, NULL, NULL); +INSERT INTO `command_points` (`id`, `command_id`, `field`, `name`, `details`, `start_address`, `step_size`, `factor`, + `precision`, `format`, `decode_name`) +VALUES (13016, 10300, 'highPressureProtection', '高压保护压力', 'MPa；低压集气方式 高压保护设置；', 66, 1, 100.00, 2, + NULL, 'factor'); +INSERT INTO `command_points` (`id`, `command_id`, `field`, `name`, `details`, `start_address`, `step_size`, `factor`, + `precision`, `format`, `decode_name`) +VALUES (13017, 10300, 'lowPressureProtection', '低压保护压力', 'MPa；高压集气方式 低压保护设置；', 67, 1, 100.00, 2, + NULL, 'factor'); +INSERT INTO `command_points` (`id`, `command_id`, `field`, `name`, `details`, `start_address`, `step_size`, `factor`, + `precision`, `format`, `decode_name`) +VALUES (13018, 10300, 'tooFastCount', '过快次数设置', '次', 68, 1, NULL, NULL, NULL, NULL); +INSERT INTO `command_points` (`id`, `command_id`, `field`, `name`, `details`, `start_address`, `step_size`, `factor`, + `precision`, `format`, `decode_name`) +VALUES (13019, 10300, 'dangerousRiseTime', '危险上升时间', '秒', 69, 1, NULL, NULL, NULL, 'secondLocalTime'); +INSERT INTO `command_points` (`id`, `command_id`, `field`, `name`, `details`, `start_address`, `step_size`, `factor`, + `precision`, `format`, `decode_name`) +VALUES (13020, 10300, 'tooFastRiseTime', '过快上升时间', '秒', 70, 1, NULL, NULL, NULL, 'secondLocalTime'); +INSERT INTO `command_points` (`id`, `command_id`, `field`, `name`, `details`, `start_address`, `step_size`, `factor`, + `precision`, `format`, `decode_name`) +VALUES (13021, 10300, 'openWellTime', '开井时间设置', '小时', 71, 1, 60.00, 2, NULL, 'factor'); +INSERT INTO `command_points` (`id`, `command_id`, `field`, `name`, `details`, `start_address`, `step_size`, `factor`, + `precision`, `format`, `decode_name`) +VALUES (13022, 10300, 'closeWellTime', '关井时间设置', '小时', 72, 1, 60.00, 2, NULL, 'factor'); +INSERT INTO `command_points` (`id`, `command_id`, `field`, `name`, `details`, `start_address`, `step_size`, `factor`, + `precision`, `format`, `decode_name`) +VALUES (13023, 10300, 'openWellCasPressure', '套压开井压力', 'MPa；压力优化微升模式；', 73, 1, 100.00, 2, NULL, 'factor'); +INSERT INTO `command_points` (`id`, `command_id`, `field`, `name`, `details`, `start_address`, `step_size`, `factor`, + `precision`, `format`, `decode_name`) +VALUES (13024, 10300, 'littleRiseCasPressure', '套压微升压力', 'MPa；压力优化微升模式；', 74, 1, 100.00, 2, NULL, + 'factor'); +INSERT INTO `command_points` (`id`, `command_id`, `field`, `name`, `details`, `start_address`, `step_size`, `factor`, + `precision`, `format`, `decode_name`) +VALUES (13025, 10300, 'checkStabilityTime', '检测稳定时间', '秒', 75, 1, NULL, NULL, NULL, 'secondLocalTime'); +INSERT INTO `command_points` (`id`, `command_id`, `field`, `name`, `details`, `start_address`, `step_size`, `factor`, + `precision`, `format`, `decode_name`) +VALUES (13026, 10300, 'minCloseWellTime', '最小关井时间', '分钟', 76, 1, NULL, NULL, NULL, 'minuteLocalTime'); +INSERT INTO `command_points` (`id`, `command_id`, `field`, `name`, `details`, `start_address`, `step_size`, `factor`, + `precision`, `format`, `decode_name`) +VALUES (13027, 10300, 'maxCloseWellTime', '最大关井时间', '分钟', 77, 1, NULL, NULL, NULL, 'minuteLocalTime'); +INSERT INTO `command_points` (`id`, `command_id`, `field`, `name`, `details`, `start_address`, `step_size`, `factor`, + `precision`, `format`, `decode_name`) +VALUES (13028, 10300, 'minOpenWellTime', '最小开井时间', '分钟', 78, 1, NULL, NULL, NULL, 'minuteLocalTime'); +INSERT INTO `command_points` (`id`, `command_id`, `field`, `name`, `details`, `start_address`, `step_size`, `factor`, + `precision`, `format`, `decode_name`) +VALUES (13029, 10300, 'maxOpenWellTime', '最大开井时间', '分钟', 79, 1, NULL, NULL, NULL, 'minuteLocalTime'); +INSERT INTO `command_points` (`id`, `command_id`, `field`, `name`, `details`, `start_address`, `step_size`, `factor`, + `precision`, `format`, `decode_name`) +VALUES (13030, 10300, 'wellDepth', '气井深度', '米', 80, 1, NULL, NULL, NULL, NULL); +INSERT INTO `command_points` (`id`, `command_id`, `field`, `name`, `details`, `start_address`, `step_size`, `factor`, + `precision`, `format`, `decode_name`) +VALUES (13031, 10300, 'produceMode', '生产制度', '1-常开；2-常关；3-柱塞气举；', 81, 1, NULL, NULL, NULL, NULL); \ No newline at end of file diff --git a/src/main/resources/mapper/DeviceDao.xml b/src/main/resources/mapper/DeviceDao.xml index 0127dd2..7e4fc2a 100644 --- a/src/main/resources/mapper/DeviceDao.xml +++ b/src/main/resources/mapper/DeviceDao.xml @@ -10,11 +10,13 @@ - + - + - + @@ -30,12 +32,12 @@ - - + + @@ -119,15 +139,15 @@ select t.collection_time,t.oil_pressure,t.cas_pressure,t.pre_pressure from ${tableName} t - t.device_id = #{deviceId} - - and t.collection_time >= #{startTime} - - - and t.collection_time <= #{endTime} - + t.device_id = #{deviceId} + + and t.collection_time >= #{startTime} + + + and t.collection_time <= #{endTime} + - order by t.collection_time asc + order by t.collection_time asc select t.collection_time,t.oil_pressure,t.cas_pressure,t.pre_pressure - ,t.run_mode,t.status_end_time,t.temperature,t.humidity,t.well_status,t.plug_status - ,t.current_status_remaining_time as statusEndTime,t.controller_current_status as runMode,t.solenoid_valve_status as wellStatus - ,t.ctl_model as runMode,t.remaining_time_action as statusEndTime,t.solar_voltage,t.first_solenoid_status as wellStatus + + ,t.run_mode,t.status_end_time,t.temperature,t.humidity,t.well_status,t.plug_status + + ,t.current_status_remaining_time as + statusEndTime,t.controller_current_status as runMode,t.solenoid_valve_status as wellStatus + + ,t.ctl_model as runMode,t.remaining_time_action as + statusEndTime,t.solar_voltage,t.first_solenoid_status as wellStatus + from ${tableName} t t.device_id = #{deviceId}