From b1aae0b1895b78203365209949ba3508267a8bea Mon Sep 17 00:00:00 2001
From: qinjie <463333974@qq.com>
Date: Tue, 10 Dec 2024 15:29:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DeviceOptLogServiceImpl.java             | 8 +++++---
 1 file changed, 5 insertions(+), 3 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 7b2815f..428d54c 100644
--- a/src/main/java/com/isu/gaswellwatch/service/impl/DeviceOptLogServiceImpl.java
+++ b/src/main/java/com/isu/gaswellwatch/service/impl/DeviceOptLogServiceImpl.java
@@ -37,13 +37,10 @@ public class DeviceOptLogServiceImpl extends ServiceImpl<DeviceOptLogDao, Device
 
     @Override
     public void saveGasWellOptLog(Integer isOpen, Long deviceId,String source) {
-        UserLoginInfoVO userLoginInfoVO = (UserLoginInfoVO) StpUtil.getTokenSession().get(UserConstant.TOKEN_SESSION);
         DeviceVO deviceVO = this.deviceDao.getDeviceById(deviceId);
         DeviceOptLog deviceOptLog = new DeviceOptLog();
         deviceOptLog.setId(this.snowflakeConfig.snowflakeId());
         deviceOptLog.setDeviceId(deviceId);
-        deviceOptLog.setUsername(userLoginInfoVO.getUserVO().getUsername());
-        deviceOptLog.setName(userLoginInfoVO.getUserVO().getNickname());
         BlockVO blockVO = this.blockService.selectBlockById(deviceVO.getGasWell().getBlockId());
         deviceOptLog.setBlock("苏里格气田-" + blockVO.getName());
         deviceOptLog.setGasWell(deviceVO.getGasWell().getName());
@@ -52,8 +49,13 @@ public class DeviceOptLogServiceImpl extends ServiceImpl<DeviceOptLogDao, Device
         String content = "";
         if("device".equalsIgnoreCase(source)){
             content = isOpen == 1 ? "检测到气井开启" : "检测到气井关闭";
+            deviceOptLog.setUsername("系统");
+            deviceOptLog.setName("系统");
         }else{
             content = isOpen == null ? "设置成功" : (isOpen == 1 ? "开井成功" : "关井成功");
+            UserLoginInfoVO userLoginInfoVO = (UserLoginInfoVO) StpUtil.getTokenSession().get(UserConstant.TOKEN_SESSION);
+            deviceOptLog.setUsername(userLoginInfoVO.getUserVO().getUsername());
+            deviceOptLog.setName(userLoginInfoVO.getUserVO().getNickname());
         }
         deviceOptLog.setContent(content);
         this.deviceOptLogDao.insert(deviceOptLog);