From 62aa35e862c917b80c1cab2b02271fd40b8dca8e Mon Sep 17 00:00:00 2001
From: ty <1577900710@qq.com>
Date: Wed, 21 Feb 2024 19:26:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=91=8A=E8=AD=A6=E6=B5=81=E7=A8=8B=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hnac/hzims/alarm/show/service/impl/AlarmHandleServiceImpl.java  | 6 +++---
 .../hnac/hzims/alarm/source/service/impl/FdpAlarmServiceImpl.java   | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmHandleServiceImpl.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmHandleServiceImpl.java
index cc247c4..d21ec4f 100644
--- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmHandleServiceImpl.java
+++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmHandleServiceImpl.java
@@ -57,7 +57,7 @@ public class AlarmHandleServiceImpl extends BaseServiceImpl<AlarmHandleMapper, A
 
 	private final IUserClient userClient;
 
-	private final IFdpMonitorClient fdpMonitorClient;
+//	private final IFdpMonitorClient fdpMonitorClient;
 
 	private final IFlowClient processClient;
 
@@ -106,13 +106,13 @@ public class AlarmHandleServiceImpl extends BaseServiceImpl<AlarmHandleMapper, A
 //		entity.setAccessId(param.getAccessId());
 //		entity.setPhenomenonId(param.getPhenomenonId());
 		entity.setHandleUser(param.getHandleUser());
-		entity.setHandleUser(param.getHandleUser());
 		entity.setDelayTime(param.getDelayTime());
 		entity.setDelayCause(param.getDelayCause());
 		entity.setFalseAlarmDesc(param.getFalseAlarmDesc());
 		entity.setFilePath(param.getFilePath());
 		if (StringUtils.isNotBlank(AuthUtil.getUserName())){
-			entity.setCreateUserName(AuthUtil.getNickName());
+			entity.setCreateUserName(AuthUtil.getUserName());
+			param.setCreateUserName(AuthUtil.getUserName());
 			entity.setCreateDeptName(param.getCreateDeptName());
 		}
 		this.save(entity);
diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/impl/FdpAlarmServiceImpl.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/impl/FdpAlarmServiceImpl.java
index 4cf5689..9e8d089 100644
--- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/impl/FdpAlarmServiceImpl.java
+++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/impl/FdpAlarmServiceImpl.java
@@ -91,6 +91,7 @@ public class FdpAlarmServiceImpl implements FdpAlarmService {
         entity.setDeviceCode(item.getDeviceId());
         entity.setDeviceName(item.getDeviceName());
         entity.setAlarmStatus(Integer.valueOf(item.getStatus()));
+        entity.setAlarmValue(item.getInfo());
         entity.setStationId(item.getStation());
         entity.setAlarmSource(EARLY_WARNING);
         entity.setTenantId("200000");