告警流程代码修正

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);

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");