From 7175e4e15a3ff531ccff6f9e31ffa0ae2a4c453d Mon Sep 17 00:00:00 2001
From: yang_shj <1069818635@QQ.com>
Date: Thu, 28 Mar 2024 14:22:27 +0800
Subject: [PATCH] =?UTF-8?q?#=E7=94=A8=E6=88=B7=E5=B1=95=E7=A4=BA=E6=98=B5?=
 =?UTF-8?q?=E7=A7=B0=E4=BF=AE=E6=94=B9=E4=B8=BA=E5=A7=93=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/operation/business/impl/DutyServiceImpl.java   |  8 ++++----
 .../inspect/offline/wrapper/OfflineRecordWrapper.java      |  4 ++--
 .../hnac/hzims/message/wrapper/MsgPushRecordWrapper.java   |  4 ++--
 .../hnac/hzims/message/wrapper/MsgSmsRecordWrapper.java    |  4 ++--
 .../hzims/message/wrapper/MsgWsRecordHistoryWrapper.java   |  4 ++--
 .../com/hnac/hzims/message/wrapper/MsgWsRecordWrapper.java |  4 ++--
 .../hzims/operational/alert/wrapper/HandleWrapper.java     |  3 +--
 .../defect/wrapper/OperDefectStatisticsWrapper.java        | 12 ++++++------
 .../operational/defect/wrapper/OperDefectWrapper.java      |  4 ++--
 .../hzims/operational/defect/wrapper/OperFaultWrapper.java |  4 ++--
 .../operational/defect/wrapper/OperPhenomenonWrapper.java  | 12 ++++++------
 .../duty/service/impl/ImsDutyChangeServiceImpl.java        | 14 +++++++-------
 .../duty/service/impl/ImsDutyEmergencyServiceImpl.java     |  4 ++--
 .../duty/service/impl/ImsDutyGroupServiceImpl.java         |  6 +++---
 .../duty/service/impl/ImsDutyMainServiceImpl.java          |  4 ++--
 .../duty/service/impl/ImsDutyRecQRRecordServiceImpl.java   |  2 +-
 .../duty/service/impl/ImsDutyRecServiceImpl.java           | 10 +++++-----
 .../hzims/operational/fill/wrapper/GenerateWrapper.java    |  2 +-
 .../hnac/hzims/operational/fill/wrapper/OtherWrapper.java  |  2 +-
 .../hzims/operational/fill/wrapper/OverConfigWrapper.java  |  2 +-
 .../hzims/operational/fill/wrapper/OverDetailsWrapper.java |  2 +-
 .../hnac/hzims/operational/fill/wrapper/OverWrapper.java   |  2 +-
 .../hnac/hzims/operational/fill/wrapper/PowerWrapper.java  |  2 +-
 .../hzims/operational/fill/wrapper/RainfallWrapper.java    |  2 +-
 .../hnac/hzims/operational/fill/wrapper/SolveWrapper.java  |  2 +-
 .../hzims/operational/fill/wrapper/StorageWrapper.java     |  2 +-
 .../hnac/hzims/operational/fill/wrapper/UseWrapper.java    |  2 +-
 .../hnac/hzims/operational/fill/wrapper/WindWrapper.java   |  2 +-
 .../station/service/impl/StationServiceImpl.java           |  2 +-
 .../safeproduct/scheduled/SafeToolTypePushUserTask.java    |  2 +-
 .../hzims/safeproduct/wrapper/ImsMonAlarmInfoWrapper.java  |  2 +-
 31 files changed, 65 insertions(+), 66 deletions(-)

diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/impl/DutyServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/impl/DutyServiceImpl.java
index 5566c77..f1ce357 100644
--- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/impl/DutyServiceImpl.java
+++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/impl/DutyServiceImpl.java
@@ -63,7 +63,7 @@ public class DutyServiceImpl extends BaseServiceImpl<DutyMapper, ImsDutyMainEnti
             // 负责人
             User user = UserCache.getUser(Long.valueOf(item.getManagerId()));
             if (ObjectUtil.isNotEmpty(user)) {
-                item.setManagerName(user.getName());
+                item.setManagerName(user.getRealName());
                 item.setManagerPhone(user.getPhone());
             }
             // FIXME 上网
@@ -117,7 +117,7 @@ public class DutyServiceImpl extends BaseServiceImpl<DutyMapper, ImsDutyMainEnti
         // 负责人
         User user = UserCache.getUser(Long.valueOf(dutyMainInfoVo.getManagerId()));
         if (ObjectUtil.isNotEmpty(user)) {
-            dutyInfoVo.setManagerName(user.getName());
+            dutyInfoVo.setManagerName(user.getRealName());
             dutyInfoVo.setManagerPhone(user.getPhone());
         }
         // 发电量
@@ -143,7 +143,7 @@ public class DutyServiceImpl extends BaseServiceImpl<DutyMapper, ImsDutyMainEnti
         // 负责人
         User user = UserCache.getUser(Long.valueOf(dutyMainInfoVo.getManagerId()));
         if (ObjectUtil.isNotEmpty(user)) {
-            dutyInfoVo.setManagerName(user.getName());
+            dutyInfoVo.setManagerName(user.getRealName());
             dutyInfoVo.setManagerPhone(user.getPhone());
         }
         dutyInfoVo.setGeneratingCapacity(0);
@@ -183,7 +183,7 @@ public class DutyServiceImpl extends BaseServiceImpl<DutyMapper, ImsDutyMainEnti
         // 负责人
         User user = UserCache.getUser(Long.valueOf(dutyMainInfoVo.getManagerId()));
         if (ObjectUtil.isNotEmpty(user)) {
-            dutyMainInfoVo.setManagerName(user.getName());
+            dutyMainInfoVo.setManagerName(user.getRealName());
             dutyMainInfoVo.setManagerPhone(user.getPhone());
         }
         return dutyMainInfoVo;
diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/offline/wrapper/OfflineRecordWrapper.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/offline/wrapper/OfflineRecordWrapper.java
index 39405d3..662b8bc 100644
--- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/offline/wrapper/OfflineRecordWrapper.java
+++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/offline/wrapper/OfflineRecordWrapper.java
@@ -24,8 +24,8 @@ public class OfflineRecordWrapper extends BaseEntityWrapper<OfflineRecordEntity,
 		OfflineRecordVO vo = BeanUtil.copy(entity, OfflineRecordVO.class);
 		User createUser = UserCache.getUser(entity.getCreateUser());
 		User updateUser = UserCache.getUser(entity.getUpdateUser());
-		vo.setCreateUserName(createUser.getName());
-		vo.setUpdateUserName(updateUser.getName());
+		vo.setCreateUserName(createUser.getRealName());
+		vo.setUpdateUserName(updateUser.getRealName());
 		return vo;
 	}
 
diff --git a/hzims-service/message/src/main/java/com/hnac/hzims/message/wrapper/MsgPushRecordWrapper.java b/hzims-service/message/src/main/java/com/hnac/hzims/message/wrapper/MsgPushRecordWrapper.java
index 79b0509..0f9c31c 100644
--- a/hzims-service/message/src/main/java/com/hnac/hzims/message/wrapper/MsgPushRecordWrapper.java
+++ b/hzims-service/message/src/main/java/com/hnac/hzims/message/wrapper/MsgPushRecordWrapper.java
@@ -24,8 +24,8 @@ public class MsgPushRecordWrapper extends BaseEntityWrapper<MsgPushRecordEntity,
 		MsgPushRecordVO vo = BeanUtil.copy(entity, MsgPushRecordVO.class);
 		User createUser = UserCache.getUser(entity.getCreateUser());
 		User updateUser = UserCache.getUser(entity.getUpdateUser());
-		vo.setCreateUserName(createUser.getName());
-		vo.setUpdateUserName(updateUser.getName());
+		vo.setCreateUserName(createUser.getRealName());
+		vo.setUpdateUserName(updateUser.getRealName());
 		return vo;
 	}
 
diff --git a/hzims-service/message/src/main/java/com/hnac/hzims/message/wrapper/MsgSmsRecordWrapper.java b/hzims-service/message/src/main/java/com/hnac/hzims/message/wrapper/MsgSmsRecordWrapper.java
index 0ac71f4..6d24c06 100644
--- a/hzims-service/message/src/main/java/com/hnac/hzims/message/wrapper/MsgSmsRecordWrapper.java
+++ b/hzims-service/message/src/main/java/com/hnac/hzims/message/wrapper/MsgSmsRecordWrapper.java
@@ -25,8 +25,8 @@ public class MsgSmsRecordWrapper extends BaseEntityWrapper<MsgSmsRecordEntity, M
 		MsgSmsRecordVO vo = BeanUtil.copy(entity, MsgSmsRecordVO.class);
 		User createUser = UserCache.getUser(entity.getCreateUser());
 		User updateUser = UserCache.getUser(entity.getUpdateUser());
-		vo.setCreateUserName(createUser.getName());
-		vo.setUpdateUserName(updateUser.getName());
+		vo.setCreateUserName(createUser.getRealName());
+		vo.setUpdateUserName(updateUser.getRealName());
 		return vo;
 	}
 
diff --git a/hzims-service/message/src/main/java/com/hnac/hzims/message/wrapper/MsgWsRecordHistoryWrapper.java b/hzims-service/message/src/main/java/com/hnac/hzims/message/wrapper/MsgWsRecordHistoryWrapper.java
index f04dc5e..0b7942b 100644
--- a/hzims-service/message/src/main/java/com/hnac/hzims/message/wrapper/MsgWsRecordHistoryWrapper.java
+++ b/hzims-service/message/src/main/java/com/hnac/hzims/message/wrapper/MsgWsRecordHistoryWrapper.java
@@ -24,8 +24,8 @@ public class MsgWsRecordHistoryWrapper extends BaseEntityWrapper<MsgWsRecordHist
 		MsgWsRecordHistoryVO vo = BeanUtil.copy(entity, MsgWsRecordHistoryVO.class);
 		User createUser = UserCache.getUser(entity.getCreateUser());
 		User updateUser = UserCache.getUser(entity.getUpdateUser());
-		vo.setCreateUserName(createUser.getName());
-		vo.setUpdateUserName(updateUser.getName());
+		vo.setCreateUserName(createUser.getRealName());
+		vo.setUpdateUserName(updateUser.getRealName());
 		return vo;
 	}
 
diff --git a/hzims-service/message/src/main/java/com/hnac/hzims/message/wrapper/MsgWsRecordWrapper.java b/hzims-service/message/src/main/java/com/hnac/hzims/message/wrapper/MsgWsRecordWrapper.java
index 724a5ea..aa8952e 100644
--- a/hzims-service/message/src/main/java/com/hnac/hzims/message/wrapper/MsgWsRecordWrapper.java
+++ b/hzims-service/message/src/main/java/com/hnac/hzims/message/wrapper/MsgWsRecordWrapper.java
@@ -25,9 +25,9 @@ public class MsgWsRecordWrapper extends BaseEntityWrapper<MsgWsRecordEntity, Msg
 		User createUser = UserCache.getUser(entity.getCreateUser());
 		if(null != entity.getUpdateUser()) {
 			User updateUser = UserCache.getUser(entity.getUpdateUser());
-			vo.setUpdateUserName(updateUser.getName());
+			vo.setUpdateUserName(updateUser.getRealName());
 		}
-		vo.setCreateUserName(createUser.getName());
+		vo.setCreateUserName(createUser.getRealName());
 		return vo;
 	}
 
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/wrapper/HandleWrapper.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/wrapper/HandleWrapper.java
index 0902031..783b914 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/wrapper/HandleWrapper.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/wrapper/HandleWrapper.java
@@ -21,8 +21,7 @@ public class HandleWrapper extends BaseEntityWrapper<AlarmHandleVo,AlarmHandleVo
 		if(ObjectUtil.isEmpty(createUser)){
 			return entity;
 		}
-		assert entity != null;
-		entity.setUserName(Optional.ofNullable(createUser.getName()).orElse(null));
+        entity.setUserName(createUser.getRealName());
 		return entity;
 	}
 }
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/wrapper/OperDefectStatisticsWrapper.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/wrapper/OperDefectStatisticsWrapper.java
index 5cac3e6..34491a3 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/wrapper/OperDefectStatisticsWrapper.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/wrapper/OperDefectStatisticsWrapper.java
@@ -26,23 +26,23 @@ public class OperDefectStatisticsWrapper extends BaseEntityWrapper<OperDefectSta
 		OperDefectStatisticsVO vo = BeanUtil.copy(entity, OperDefectStatisticsVO.class);
 		User createUser = UserCache.getUser(entity.getCreateUser());
 		User updateUser = UserCache.getUser(entity.getUpdateUser());
-		vo.setCreateUserName(createUser == null ? "" : createUser.getName());
-		vo.setUpdateUserName(updateUser == null ? "" : updateUser.getName());
+		vo.setCreateUserName(createUser == null ? "" : createUser.getRealName());
+		vo.setUpdateUserName(updateUser == null ? "" : updateUser.getRealName());
 		if (Func.isNotEmpty(entity.getConclusionPeople())) {
 			User userC = UserCache.getUser(entity.getConclusionPeople());
-			vo.setConclusionPeopleName(userC == null ? "" : userC.getName());
+			vo.setConclusionPeopleName(userC == null ? "" : userC.getRealName());
 		}
 		if (Func.isNotEmpty(entity.getFinder())) {
 			User userF = UserCache.getUser(entity.getFinder());
-			vo.setFinderName(userF == null ? "" : userF.getName());
+			vo.setFinderName(userF == null ? "" : userF.getRealName());
 		}
 		if (Func.isNotEmpty(entity.getDiscriminator())) {
 			User userD = UserCache.getUser(entity.getDiscriminator());
-			vo.setDiscriminatorName(userD == null ? "" : userD.getName());
+			vo.setDiscriminatorName(userD == null ? "" : userD.getRealName());
 		}
 		if (Func.isNotEmpty(entity.getHandler())) {
 			User userHn = UserCache.getUser(entity.getHandler());
-			vo.setHandlerName(userHn == null ? "" : userHn.getName());
+			vo.setHandlerName(userHn == null ? "" : userHn.getRealName());
 		}
 		// 赋值消缺处理人名称
 		vo.setPlanHandlerName(Optional.ofNullable(entity.getPlanHandler()).map(Long::parseLong).map(UserCache::getUser).map(User::getName).orElse(entity.getPlanHandler()));
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/wrapper/OperDefectWrapper.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/wrapper/OperDefectWrapper.java
index 71b378b..91711da 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/wrapper/OperDefectWrapper.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/wrapper/OperDefectWrapper.java
@@ -35,8 +35,8 @@ public class OperDefectWrapper extends BaseEntityWrapper<OperDefectEntity, OperD
 		OperDefectVO vo = BeanUtil.copy(entity, OperDefectVO.class);
 		User createUser = UserCache.getUser(entity.getCreateUser());
 		User updateUser = UserCache.getUser(entity.getUpdateUser());
-		vo.setCreateUserName(createUser == null ? "" : createUser.getName());
-		vo.setUpdateUserName(updateUser == null ? "" : updateUser.getName());
+		vo.setCreateUserName(createUser == null ? "" : createUser.getRealName());
+		vo.setUpdateUserName(updateUser == null ? "" : updateUser.getRealName());
 		OperPhenomenonEntity phenomenonEntity = phenomenonService.getOne(Wrappers.<OperPhenomenonEntity>lambdaUpdate()
 			.eq(OperPhenomenonEntity::getDefectCode,entity.getDefectCode()).last("limit 1"));
 		if(Func.isNotEmpty(phenomenonEntity)){
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/wrapper/OperFaultWrapper.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/wrapper/OperFaultWrapper.java
index 08bb511..0bd21e1 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/wrapper/OperFaultWrapper.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/wrapper/OperFaultWrapper.java
@@ -40,8 +40,8 @@ public class OperFaultWrapper extends BaseEntityWrapper<OperFaultEntity, OperFau
 		OperFaultVO vo = BeanUtil.copy(entity, OperFaultVO.class);
 		User createUser = UserCache.getUser(entity.getCreateUser());
 		User updateUser = UserCache.getUser(entity.getUpdateUser());
-		vo.setCreateUserName(createUser == null ? "" : createUser.getName());
-		vo.setUpdateUserName(updateUser == null ? "" : updateUser.getName());
+		vo.setCreateUserName(createUser == null ? "" : createUser.getRealName());
+		vo.setUpdateUserName(updateUser == null ? "" : updateUser.getRealName());
 		if(Func.isNotEmpty(entity.getSafeInfos())){
 			vo.setDangerSources(sourceClient.details(entity.getSafeInfos().split(",")));
 		}
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/wrapper/OperPhenomenonWrapper.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/wrapper/OperPhenomenonWrapper.java
index 645026b..f3cd5fd 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/wrapper/OperPhenomenonWrapper.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/wrapper/OperPhenomenonWrapper.java
@@ -56,20 +56,20 @@ public class OperPhenomenonWrapper extends BaseEntityWrapper<OperPhenomenonEntit
 		OperPhenomenonVO vo = BeanUtil.copy(entity, OperPhenomenonVO.class);
 		User createUser = UserCache.getUser(entity.getCreateUser());
 		User updateUser = UserCache.getUser(entity.getUpdateUser());
-		vo.setCreateUserName(createUser == null ? "" : createUser.getName());
-		vo.setUpdateUserName(updateUser == null ? "" : updateUser.getName());
+		vo.setCreateUserName(createUser == null ? "" : createUser.getRealName());
+		vo.setUpdateUserName(updateUser == null ? "" : updateUser.getRealName());
 
 		User userC = UserCache.getUser(entity.getConclusionPeople());
-		vo.setConclusionPeopleName(userC == null ? "" : userC.getName());
+		vo.setConclusionPeopleName(userC == null ? "" : userC.getRealName());
 
 		User userF = UserCache.getUser(entity.getFinder());
-		vo.setFinderName(userF == null ? "" : userF.getName());
+		vo.setFinderName(userF == null ? "" : userF.getRealName());
 
 		User userD = UserCache.getUser(entity.getDiscriminator());
-		vo.setDiscriminatorName(userD == null ? "" : userD.getName());
+		vo.setDiscriminatorName(userD == null ? "" : userD.getRealName());
 
 		User userHn = UserCache.getUser(entity.getHandler());
-		vo.setHandlerName(userHn == null ? "" : userHn.getName());
+		vo.setHandlerName(userHn == null ? "" : userHn.getRealName());
 		if(Func.isNotEmpty(entity.getSafeInfos())){
 			vo.setDangerSources(sourceClient.details(entity.getSafeInfos().split(",")));
 		}
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyChangeServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyChangeServiceImpl.java
index 0708d25..cdfa282 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyChangeServiceImpl.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyChangeServiceImpl.java
@@ -120,10 +120,10 @@ public class ImsDutyChangeServiceImpl extends BaseServiceImpl<ImsDutyChangeMappe
 		ImsDutyChangeVO vo = ImsDutyChangeWrapper.build().entityVO(detail);
 		try {
 			log.info(detail.getCreateUser() + "..............");
-			vo.setCreateUserName(UserCache.getUser(detail.getCreateUser()).getName());
-			vo.setUpdateUserName(UserCache.getUser(detail.getUpdateUser()).getName());
-			vo.setAcceptPersonName(UserCache.getUser(detail.getAcceptPersonId()).getName());
-			vo.setApplyPersonName(UserCache.getUser(detail.getApplyPersonId()).getName());
+			vo.setCreateUserName(UserCache.getUser(detail.getCreateUser()).getRealName());
+			vo.setUpdateUserName(UserCache.getUser(detail.getUpdateUser()).getRealName());
+			vo.setAcceptPersonName(UserCache.getUser(detail.getAcceptPersonId()).getRealName());
+			vo.setApplyPersonName(UserCache.getUser(detail.getApplyPersonId()).getRealName());
 			ImsSchedulingVo imsSchedulingVo1 = dutyMainService.getByIdOneV2(detail.getAcceptDutyId());
 			vo.setAcceptDutyMainVo(imsSchedulingVo1 == null ? null : imsSchedulingVo1);
 			ImsSchedulingVo imsSchedulingVo = dutyMainService.getByIdOneV2(detail.getApplyDutyId());
@@ -139,7 +139,7 @@ public class ImsDutyChangeServiceImpl extends BaseServiceImpl<ImsDutyChangeMappe
 		List<ImsDutyChangeTowVo> imsDutyChangeTowVos = this.baseMapper.selectListDetails(page);
 		for (ImsDutyChangeTowVo imsDutyChangeTowVo : imsDutyChangeTowVos) {
 			if (Func.isNotBlank(imsDutyChangeTowVo.getManager() + "")) {
-				imsDutyChangeTowVo.setManagerName(userClient.userInfoById(imsDutyChangeTowVo.getManager()).getData().getName());
+				imsDutyChangeTowVo.setManagerName(userClient.userInfoById(imsDutyChangeTowVo.getManager()).getData().getRealName());
 			}
 		}
 		return page.setRecords(imsDutyChangeTowVos);
@@ -147,8 +147,8 @@ public class ImsDutyChangeServiceImpl extends BaseServiceImpl<ImsDutyChangeMappe
 
 	@Override
 	public void setUserNmae(ImsDutyChangeVO vo) {
-		vo.setApplyPersonName(userClient.userInfoById(vo.getApplyPersonId()).getData().getName());//申请人
-		vo.setAcceptPersonName(userClient.userInfoById(vo.getAcceptPersonId()).getData().getName());//调班人
+		vo.setApplyPersonName(userClient.userInfoById(vo.getApplyPersonId()).getData().getRealName());//申请人
+		vo.setAcceptPersonName(userClient.userInfoById(vo.getAcceptPersonId()).getData().getRealName());//调班人
 
 	}
 
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyEmergencyServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyEmergencyServiceImpl.java
index 7e836e0..250304b 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyEmergencyServiceImpl.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyEmergencyServiceImpl.java
@@ -81,11 +81,11 @@ public class ImsDutyEmergencyServiceImpl extends BaseServiceImpl<ImsDutyEmergenc
 			collect= records.stream().map(sig -> {
 				R<User> user = userClient.userInfoById(sig.getRegistrant());
 				if (user.isSuccess()&&ObjectUtils.isNotEmpty(user.getData())){
-					sig.setRegistrantName(user.getData().getName());
+					sig.setRegistrantName(user.getData().getRealName());
 				}
 				R<User> userR = userClient.userInfoById(sig.getChargePerson());
 				if (userR.isSuccess()&&ObjectUtils.isNotEmpty(userR.getData())){
-					sig.setChargePersonName(userR.getData().getName());
+					sig.setChargePersonName(userR.getData().getRealName());
 				}
 				ImsDutyClassEntity classEntity = imsDutyClassService.getById(sig.getDutyClass());
 				sig.setDutyClassName(classEntity.getClassName());
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyGroupServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyGroupServiceImpl.java
index 17d4e0b..e666e12 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyGroupServiceImpl.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyGroupServiceImpl.java
@@ -226,8 +226,8 @@ public class ImsDutyGroupServiceImpl extends BaseServiceImpl<ImsDutyGroupMapper,
 		for (ImsDutyGroupPVO imsDutyGroupPVo : imsDutyGroupPEntities) {
 			imsDutyGroupPVo.setSignage(false);
 			User user = UserCache.getUser(imsDutyGroupPVo.getPersonId());
-			if (ObjectUtil.isNotEmpty(user) && Func.isNotBlank(user.getName())) {
-				imsDutyGroupPVo.setGroupName(user.getName());
+			if (ObjectUtil.isNotEmpty(user) && Func.isNotBlank(user.getRealName())) {
+				imsDutyGroupPVo.setGroupName(user.getRealName());
 			} else {
 				groupIds.add(imsDutyGroupPVo.getId().toString());
 				this.baseMapper.updateManagerIdById(imsDutyGroupPVo.getGroupId());
@@ -313,7 +313,7 @@ public class ImsDutyGroupServiceImpl extends BaseServiceImpl<ImsDutyGroupMapper,
 				if (managerId!=null) {
 					R<User> userR = userClient.userInfoById(managerId);
 					if (userR.isSuccess() && ObjectUtil.isNotEmpty(userR.getData())) {
-						userName = userR.getData().getName();
+						userName = userR.getData().getRealName();
 
 					}
 				}
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyMainServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyMainServiceImpl.java
index d55b882..2f7eda3 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyMainServiceImpl.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyMainServiceImpl.java
@@ -803,9 +803,9 @@ public class ImsDutyMainServiceImpl extends BaseServiceImpl<ImsDutyMainMapper, I
                                 User user = UserCache.getUser(Long.valueOf(split[j]));
                                 if (ObjectUtil.isNotEmpty(user)) {
                                     if (j == split.length - 1) {
-                                        s.setName(s.getName() + user.getName());
+                                        s.setName(s.getName() + user.getRealName());
                                     } else {
-                                        s.setName(s.getName() + user.getName() + "、");
+                                        s.setName(s.getName() + user.getRealName() + "、");
                                     }
                                 }
                             }
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyRecQRRecordServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyRecQRRecordServiceImpl.java
index d67ef51..e1b8154 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyRecQRRecordServiceImpl.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyRecQRRecordServiceImpl.java
@@ -45,7 +45,7 @@ public class ImsDutyRecQRRecordServiceImpl extends BaseServiceImpl<ImsDutyRecQRR
 		for (ImsDutyRecQRRecordVo imsDutyRecQRRecordVo : imsDutyRecQRRecordVoIPage) {
 			User data = userClient.userInfoById(imsDutyRecQRRecordVo.getPersonId()).getData();
 			if(ObjectUtil.isNotEmpty(data)){
-				imsDutyRecQRRecordVo.setUserName(data.getName());
+				imsDutyRecQRRecordVo.setUserName(data.getRealName());
 			}
 
 		}
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyRecServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyRecServiceImpl.java
index f0e3942..2cd8546 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyRecServiceImpl.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyRecServiceImpl.java
@@ -323,8 +323,8 @@ public class ImsDutyRecServiceImpl extends BaseServiceImpl<ImsDutyRecMapper, Ims
             String userName = "";
             PushExtrasReq req = new PushExtrasReq();
             log.info("--------------------------req:" + req, groupEntityManagerId, userName, date);
-            if (ObjectUtil.isNotEmpty(userR.getData()) && StringUtil.isNotBlank(userR.getData().getName())) {
-                userName = userR.getData().getName();
+            if (ObjectUtil.isNotEmpty(userR.getData()) && StringUtil.isNotBlank(userR.getData().getRealName())) {
+                userName = userR.getData().getRealName();
                 log.info("--------------------------req2:" + req, groupEntityManagerId, userName, date);
             }
             String format = DateUtil.format(date, DateUtil.PATTERN_DATETIME);
@@ -514,11 +514,11 @@ public class ImsDutyRecServiceImpl extends BaseServiceImpl<ImsDutyRecMapper, Ims
         }
         ImsSchedulingVo imsSchedulingVo = imsDutyMainServiceImpl.getByIdOneV2(entity.getId(), null);//交班人
         if (ObjectUtil.isNotEmpty(imsSchedulingVo)&&null != imsSchedulingVo.getManagerId()) {
-            imsSchedulingVo.setUserName(userClient.userInfoById(imsSchedulingVo.getManagerId()).getData().getName());
+            imsSchedulingVo.setUserName(userClient.userInfoById(imsSchedulingVo.getManagerId()).getData().getRealName());
         }
         ImsSchedulingVo imsSchedulingVo1 = imsDutyMainServiceImpl.getByIdOneV2(null, entity.getId());
         if (ObjectUtil.isNotEmpty(imsSchedulingVo1)&&null != imsSchedulingVo1.getManagerId()) {
-            imsSchedulingVo1.setUserName(userClient.userInfoById(imsSchedulingVo1.getManagerId()).getData().getName());
+            imsSchedulingVo1.setUserName(userClient.userInfoById(imsSchedulingVo1.getManagerId()).getData().getRealName());
         }else {
             throw new ServiceException("没有找到接班对象值班信息，请联系管理人员，进行尽快进行排班！！！！");
         }
@@ -735,7 +735,7 @@ public class ImsDutyRecServiceImpl extends BaseServiceImpl<ImsDutyRecMapper, Ims
                 if (ObjectUtil.isNotEmpty(groupEntityManagerId) && ObjectUtil.isNotEmpty(classEntity)) {
                     String userName = "";
                     if (null != groupEntityManagerId) {
-                        userName = userClient.userInfoById(groupEntityManagerId).getData().getName();
+                        userName = userClient.userInfoById(groupEntityManagerId).getData().getRealName();
                     }
                     PushExtrasReq req = new PushExtrasReq();
                     if (null != entity.getPreDutyId()) {
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/wrapper/GenerateWrapper.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/wrapper/GenerateWrapper.java
index a61aaa7..c8ca929 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/wrapper/GenerateWrapper.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/wrapper/GenerateWrapper.java
@@ -29,7 +29,7 @@ public class GenerateWrapper extends BaseEntityWrapper<GenerateEntity, GenerateV
 			return vo;
 		}
 		assert vo != null;
-		vo.setUserName(Optional.ofNullable(createUser.getName()).orElse(null));
+		vo.setUserName(createUser.getRealName());
 		return vo;
 	}
 
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/wrapper/OtherWrapper.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/wrapper/OtherWrapper.java
index 204b1ea..5aba812 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/wrapper/OtherWrapper.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/wrapper/OtherWrapper.java
@@ -25,7 +25,7 @@ public class OtherWrapper extends BaseEntityWrapper<OtherEntity, OtherVo>  {
 			return vo;
 		}
 		assert vo != null;
-		vo.setUserName(Optional.ofNullable(createUser.getName()).orElse(null));
+		vo.setUserName(createUser.getRealName());
 		vo.setAscriptionUser(entity.getCreateUser());
 		return vo;
 	}
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/wrapper/OverConfigWrapper.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/wrapper/OverConfigWrapper.java
index 2b414ec..5318d67 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/wrapper/OverConfigWrapper.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/wrapper/OverConfigWrapper.java
@@ -25,7 +25,7 @@ public class OverConfigWrapper extends BaseEntityWrapper<OverConfigEntity, OverC
 			return vo;
 		}
 		assert vo != null;
-		vo.setUserName(Optional.ofNullable(createUser.getName()).orElse(null));
+		vo.setUserName(createUser.getRealName());
 		vo.setAscriptionUser(entity.getCreateUser());
 		return vo;
 	}
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/wrapper/OverDetailsWrapper.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/wrapper/OverDetailsWrapper.java
index e765449..d7c97c3 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/wrapper/OverDetailsWrapper.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/wrapper/OverDetailsWrapper.java
@@ -25,7 +25,7 @@ public class OverDetailsWrapper extends BaseEntityWrapper<OverDetailsEntity, Ove
 			return vo;
 		}
 		assert vo != null;
-		vo.setUserName(Optional.ofNullable(createUser.getName()).orElse(null));
+		vo.setUserName(createUser.getRealName());
 		vo.setAscriptionUser(entity.getCreateUser());
 		return vo;
 	}
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/wrapper/OverWrapper.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/wrapper/OverWrapper.java
index 2b18cfb..eab938e 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/wrapper/OverWrapper.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/wrapper/OverWrapper.java
@@ -25,7 +25,7 @@ public class OverWrapper extends BaseEntityWrapper<OverEntity, OverVo>  {
 			return vo;
 		}
 		assert vo != null;
-		vo.setUserName(Optional.ofNullable(createUser.getName()).orElse(null));
+		vo.setUserName(createUser.getRealName());
 		vo.setAscriptionUser(entity.getCreateUser());
 		return vo;
 	}
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/wrapper/PowerWrapper.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/wrapper/PowerWrapper.java
index 878b4a8..f92102b 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/wrapper/PowerWrapper.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/wrapper/PowerWrapper.java
@@ -25,7 +25,7 @@ public class PowerWrapper extends BaseEntityWrapper<PowerEntity, PowerVo>  {
 			return vo;
 		}
 		assert vo != null;
-		vo.setUserName(Optional.ofNullable(createUser.getName()).orElse(null));
+		vo.setUserName(createUser.getRealName());
 		vo.setAscriptionUser(entity.getCreateUser());
 		return vo;
 	}
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/wrapper/RainfallWrapper.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/wrapper/RainfallWrapper.java
index fea7831..87b2b13 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/wrapper/RainfallWrapper.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/wrapper/RainfallWrapper.java
@@ -29,7 +29,7 @@ public class RainfallWrapper extends BaseEntityWrapper<RainfallEntity, RainfallV
 			return vo;
 		}
 		assert vo != null;
-		vo.setUserName(Optional.ofNullable(createUser.getName()).orElse(null));
+		vo.setUserName(createUser.getRealName());
 		return vo;
 	}
 
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/wrapper/SolveWrapper.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/wrapper/SolveWrapper.java
index 9b8c4e0..74008cd 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/wrapper/SolveWrapper.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/wrapper/SolveWrapper.java
@@ -25,7 +25,7 @@ public class SolveWrapper extends BaseEntityWrapper<SolveEntity, SolveVo>  {
 			return vo;
 		}
 		assert vo != null;
-		vo.setUserName(Optional.ofNullable(createUser.getName()).orElse(null));
+		vo.setUserName(createUser.getRealName());
 		vo.setAscriptionUser(entity.getCreateUser());
 		return vo;
 	}
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/wrapper/StorageWrapper.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/wrapper/StorageWrapper.java
index d01f7a5..81a28dc 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/wrapper/StorageWrapper.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/wrapper/StorageWrapper.java
@@ -29,7 +29,7 @@ public class StorageWrapper extends BaseEntityWrapper<StorageEntity, StorageVo>
 			return vo;
 		}
 		assert vo != null;
-		vo.setUserName(Optional.ofNullable(createUser.getName()).orElse(null));
+		vo.setUserName(createUser.getRealName());
 		return vo;
 	}
 
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/wrapper/UseWrapper.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/wrapper/UseWrapper.java
index d8f53b6..e08cc06 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/wrapper/UseWrapper.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/wrapper/UseWrapper.java
@@ -29,7 +29,7 @@ public class UseWrapper extends BaseEntityWrapper<UseEntity, UseVo>  {
 			return vo;
 		}
 		assert vo != null;
-		vo.setUserName(Optional.ofNullable(createUser.getName()).orElse(null));
+		vo.setUserName(createUser.getRealName());
 		return vo;
 	}
 
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/wrapper/WindWrapper.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/wrapper/WindWrapper.java
index ab8609e..b16a483 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/wrapper/WindWrapper.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/wrapper/WindWrapper.java
@@ -25,7 +25,7 @@ public class WindWrapper extends BaseEntityWrapper<WindEntity, WindVo>  {
 			return vo;
 		}
 		assert vo != null;
-		vo.setUserName(createUser.getName());
+		vo.setUserName(createUser.getRealName());
 		return vo;
 	}
 
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationServiceImpl.java
index 79997f8..78d95f3 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationServiceImpl.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationServiceImpl.java
@@ -90,7 +90,7 @@ public class StationServiceImpl extends BaseServiceImpl<StationMapper, StationEn
             throw new ServiceException("创建/修改机构失败！");
         });
         Optional<Integer> sort = Optional.ofNullable(this.getStationMaxOrder());
-        req.setSort(sort.isPresent() ? sort.get() + 1 : 1);
+        req.setSort(sort.map(integer -> integer + 1).orElse(1));
         boolean updateResult = this.saveOrUpdate(req);
         Assert.isTrue(updateResult, () -> {
             throw new ServiceException("创建/修改站点信息失败！");
diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/scheduled/SafeToolTypePushUserTask.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/scheduled/SafeToolTypePushUserTask.java
index 37f8adc..3ecf7ae 100644
--- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/scheduled/SafeToolTypePushUserTask.java
+++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/scheduled/SafeToolTypePushUserTask.java
@@ -129,7 +129,7 @@ public class SafeToolTypePushUserTask {
 				else {
 					typeNames = typeEntityList.stream().map(SafetyToolTypeEntity::getTypeName).collect(Collectors.joining("、"));
 				}
-				XxlJobLogger.log("开始推送，推送人：{}",JSONObject.toJSONString(noticeUser.getName()));
+				XxlJobLogger.log("开始推送，推送人：{}",JSONObject.toJSONString(noticeUser.getRealName()));
 				if(sendType == APP_PUSH && Func.isNotEmpty(noticeUser.getPhone())){
 					//短信推送
 					String code = "safeTool";
diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/wrapper/ImsMonAlarmInfoWrapper.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/wrapper/ImsMonAlarmInfoWrapper.java
index 896aebf..084d6d5 100644
--- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/wrapper/ImsMonAlarmInfoWrapper.java
+++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/wrapper/ImsMonAlarmInfoWrapper.java
@@ -28,7 +28,7 @@ public class ImsMonAlarmInfoWrapper extends BaseEntityWrapper<ImsMonAlarmInfoEnt
 		if(entity != null){
 			ImsMonAlarmInfoVO vo = BeanUtil.copy(entity, ImsMonAlarmInfoVO.class);
 			vo.setCameraName(cameraInfoService.getById(vo.getCameraId()).getName());
-			vo.setAcceptUserName(UserCache.getUser(entity.getCreateUser()).getName());
+			vo.setAcceptUserName(UserCache.getUser(entity.getCreateUser()).getRealName());
 			return vo;
 		} else {
 			return null;