From 688d7ec4838f2b8803fe2ca6a40ac7f804a37b41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=AD=E6=89=BF?= <guocheng@xinyingpower.com>
Date: Mon, 14 Apr 2025 13:56:55 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/gis/GisSf6PressureServiceImpl.java      | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/service/impl/gis/GisSf6PressureServiceImpl.java b/busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/service/impl/gis/GisSf6PressureServiceImpl.java
index df39085..3dbbb32 100644
--- a/busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/service/impl/gis/GisSf6PressureServiceImpl.java
+++ b/busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/service/impl/gis/GisSf6PressureServiceImpl.java
@@ -104,12 +104,16 @@ public class GisSf6PressureServiceImpl extends AbstractCacEtlService<GisSf6Press
 
     @Override
     protected void saveHistoryData(GisSf6Pressure cacEntity, EquipmentInfoDto equipmentInfo) {
-        if (null != cacEntity.getAbsolutePressure() && !cacEntity.getAbsolutePressure().equals("")) {
-            int absolutePressureInt = Integer.parseInt(cacEntity.getAbsolutePressure()) - 100;
-            cacEntity.setPressure20c(absolutePressureInt+"");
-        } else if (null != cacEntity.getPressure20c() && !cacEntity.getPressure20c().equals("")) {
-            int pressure20cInt = Integer.parseInt(cacEntity.getPressure20c()) + 100;
-            cacEntity.setAbsolutePressure(pressure20cInt+"");
+        try {
+            if (cacEntity.getAbsolutePressure() != null && cacEntity.getPressure20c() == null) {
+                int absolutePressureInt = Integer.parseInt(cacEntity.getAbsolutePressure()) - 100;
+                cacEntity.setPressure20c(absolutePressureInt+"");
+            }
+            if (cacEntity.getPressure20c() != null && cacEntity.getAbsolutePressure() == null) {
+                int pressure20cInt = Integer.parseInt(cacEntity.getPressure20c()) + 100;
+                cacEntity.setAbsolutePressure(pressure20cInt+"");
+            }
+        } catch (Exception ignore) {
         }
 
         String equipmentSensitivity = "--";