From fa231d9d44f0424a8d399c1c315fee27f394e01e Mon Sep 17 00:00:00 2001
From: wangshilong <shilong.wang@alpha-ess.com>
Date: Sat, 21 Dec 2024 16:05:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=8F=E8=94=BD=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DeviceOptLogServiceImpl.java             | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/isu/gaswellwatch/service/impl/DeviceOptLogServiceImpl.java b/src/main/java/com/isu/gaswellwatch/service/impl/DeviceOptLogServiceImpl.java
index 428d54c..2df0d00 100644
--- a/src/main/java/com/isu/gaswellwatch/service/impl/DeviceOptLogServiceImpl.java
+++ b/src/main/java/com/isu/gaswellwatch/service/impl/DeviceOptLogServiceImpl.java
@@ -36,7 +36,7 @@ public class DeviceOptLogServiceImpl extends ServiceImpl<DeviceOptLogDao, Device
     private SnowflakeConfig snowflakeConfig;
 
     @Override
-    public void saveGasWellOptLog(Integer isOpen, Long deviceId,String source) {
+    public void saveGasWellOptLog(Integer isOpen, Long deviceId, String source) {
         DeviceVO deviceVO = this.deviceDao.getDeviceById(deviceId);
         DeviceOptLog deviceOptLog = new DeviceOptLog();
         deviceOptLog.setId(this.snowflakeConfig.snowflakeId());
@@ -47,11 +47,11 @@ public class DeviceOptLogServiceImpl extends ServiceImpl<DeviceOptLogDao, Device
         deviceOptLog.setDeviceDetail(deviceVO.getDeviceType().getName() + "-" + deviceVO.getProduct().getName());
         deviceOptLog.setGasStation(deviceVO.getGasStation());
         String content = "";
-        if("device".equalsIgnoreCase(source)){
-            content = isOpen == 1 ? "检测到气井开启" : "检测到气井关闭";
+        if ("device".equalsIgnoreCase(source)) {
+            content = isOpen == null ? "" : isOpen == 1 ? "检测到气井开启" : "检测到气井关闭";
             deviceOptLog.setUsername("系统");
             deviceOptLog.setName("系统");
-        }else{
+        } else {
             content = isOpen == null ? "设置成功" : (isOpen == 1 ? "开井成功" : "关井成功");
             UserLoginInfoVO userLoginInfoVO = (UserLoginInfoVO) StpUtil.getTokenSession().get(UserConstant.TOKEN_SESSION);
             deviceOptLog.setUsername(userLoginInfoVO.getUserVO().getUsername());