From ebe6bfc0ab82eef67373edebc2850001fcf25a4c Mon Sep 17 00:00:00 2001
From: qinjie <463333974@qq.com>
Date: Wed, 11 Dec 2024 18:16:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=BC=80=E7=9B=91=E5=90=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modbus/data/listener/BusinessMessageHandlerListener.java   | 3 +++
 .../com/isu/gaswellwatch/service/impl/SummaryServiceImpl.java  | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/isu/gaswellwatch/modbus/data/listener/BusinessMessageHandlerListener.java b/src/main/java/com/isu/gaswellwatch/modbus/data/listener/BusinessMessageHandlerListener.java
index 2226c2b..a9d99ec 100755
--- a/src/main/java/com/isu/gaswellwatch/modbus/data/listener/BusinessMessageHandlerListener.java
+++ b/src/main/java/com/isu/gaswellwatch/modbus/data/listener/BusinessMessageHandlerListener.java
@@ -76,6 +76,9 @@ public class BusinessMessageHandlerListener implements BatchMessageListener {
                 }
                 //根据设备ID获取设备的产品类型
                 DeviceVO device = this.deviceService.getDevice(Long.valueOf(deviceId));
+                if(null == device){
+                    continue;
+                }
                 //根据对应的产品类型，用对应的气井开关字段获取开关状态(wellStatus,solenoidValveStatus,firstSolenoidStatus)
                 String wellStatusKey = getWellStatusKey(device);
                 //比对新旧数据，看开关状态是否一致
diff --git a/src/main/java/com/isu/gaswellwatch/service/impl/SummaryServiceImpl.java b/src/main/java/com/isu/gaswellwatch/service/impl/SummaryServiceImpl.java
index a83f481..cef65e0 100644
--- a/src/main/java/com/isu/gaswellwatch/service/impl/SummaryServiceImpl.java
+++ b/src/main/java/com/isu/gaswellwatch/service/impl/SummaryServiceImpl.java
@@ -159,7 +159,7 @@ public class SummaryServiceImpl  implements SummaryService {
         normalStyleVO1.setColor("#333399");
         LineStyleVO lineStyleVO1 = new LineStyleVO();
         lineStyleVO1.setColor("#333399");
-        normalStyleVO.setLineStyle(lineStyleVO1);
+        normalStyleVO1.setLineStyle(lineStyleVO1);
         itemStyleVO1.setNormal(normalStyleVO1);
         cas.setItemStyle(itemStyleVO1);