From 4ff1723f658f77de41c469be4cfe3845e4e6fa2c Mon Sep 17 00:00:00 2001
From: wangshilong <shilong.wang@alpha-ess.com>
Date: Thu, 6 Mar 2025 23:39:43 +0800
Subject: [PATCH] =?UTF-8?q?MI=E5=A8=81=E5=B0=94=E6=99=AE=E6=96=AF=E6=8C=87?=
 =?UTF-8?q?=E4=BB=A4=E8=B0=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WepsRemainingLocalTimeDecodeHandler.java  |  8 +++---
 .../resources/MI_WEPS_change_20250306.sql     | 25 +++++++++++++++++++
 2 files changed, 29 insertions(+), 4 deletions(-)
 create mode 100644 src/main/resources/MI_WEPS_change_20250306.sql

diff --git a/src/main/java/com/isu/gaswellwatch/modbus/data/decode/impl/weps/WepsRemainingLocalTimeDecodeHandler.java b/src/main/java/com/isu/gaswellwatch/modbus/data/decode/impl/weps/WepsRemainingLocalTimeDecodeHandler.java
index 67186a9..85c20c2 100644
--- a/src/main/java/com/isu/gaswellwatch/modbus/data/decode/impl/weps/WepsRemainingLocalTimeDecodeHandler.java
+++ b/src/main/java/com/isu/gaswellwatch/modbus/data/decode/impl/weps/WepsRemainingLocalTimeDecodeHandler.java
@@ -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);
diff --git a/src/main/resources/MI_WEPS_change_20250306.sql b/src/main/resources/MI_WEPS_change_20250306.sql
new file mode 100644
index 0000000..ade0416
--- /dev/null
+++ b/src/main/resources/MI_WEPS_change_20250306.sql
@@ -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`;
\ No newline at end of file