#用户展示昵称修改为姓名

hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/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;
 	}
 }

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

hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/entity/InspectionTaskSMS.java

@@ -31,7 +31,7 @@ public class InspectionTaskSMS extends TaskEntity {
 	 */
 	public void setSmsDetail(){
 		User user = UserCache.getUser(this.getUserId());
-		this.setCnName(user.getName());
+		this.setCnName(user.getRealName());
 		this.setPhone(user.getPhone());
 		this.setLoginName(user.getAccount());
 	}

hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskServiceImpl.java

@@ -364,7 +364,7 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, TaskEntity> imp
                 taskReportVO.setCompleteSituation(finishSituation);
                 taskReportVO.setIncompleteNum(list.stream().filter(taskCountVO -> Func.isNotEmpty(taskCountVO.getUndoneTask())).collect(Collectors.summingInt(TaskCountVO::getUndoneTask)));
                 taskReportVO.setIncompleteSituation(undoSituation);
-                taskReportVO.setUserName(user.getName());
+                taskReportVO.setUserName(user.getRealName());
                 result.add(taskReportVO);
             }
         });

hzims-service/message/src/main/java/com/hnac/hzims/message/fegin/MessageClient.java

@@ -187,7 +187,7 @@ public class MessageClient extends BladeController implements IMessageClient{
 				if (ObjectUtil.isEmpty(user)||ObjectUtil.isEmpty(user.getPhone())){
 					continue;
 				}
-				record.setPusherName(user.getName());
+				record.setPusherName(user.getRealName());
 				record.setPusher(pushId.toString());
 				record.setPushType(MessageConstants.IMMEDIATELY);
 				record.setDeptName(Func.isNotEmpty(record.getDeptName()) ? record.getDeptName() : this.getDeptNameById(record.getDeptId()));

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

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

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

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

hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/excel/BaseExport.java

@@ -12,6 +12,6 @@ public abstract class BaseExport {
 
 	protected String getUserName(Long uid) {
 		User user = UserCache.getUser(uid);
-		return user != null ? user.getName() : uid != null ? uid.toString() : StringUtils.EMPTY;
+		return user != null ? user.getRealName() : uid != null ? uid.toString() : StringUtils.EMPTY;
 	}
 }

hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/AccessPlanV4ServiceImpl.java

@@ -126,20 +126,20 @@ public class AccessPlanV4ServiceImpl implements AccessPlanV4Service{
         entity.setActStartTime(new Date());
         if (ObjectUtil.isNotEmpty(entity.getTechLead())){
             User user = UserCache.getUser(entity.getTechLead());
-            if (ObjectUtil.isNotEmpty(user)&& StringUtils.isNotEmpty(user.getName())){
-                entity.setTechLeadName(user.getName());
+            if (ObjectUtil.isNotEmpty(user)&& StringUtils.isNotEmpty(user.getRealName())){
+                entity.setTechLeadName(user.getRealName());
             }
         }
         if (ObjectUtil.isNotEmpty(entity.getManager())){
             User user = UserCache.getUser(entity.getManager());
-            if (ObjectUtil.isNotEmpty(user)&& StringUtils.isNotEmpty(user.getName())){
-                entity.setManagerName(user.getName());
+            if (ObjectUtil.isNotEmpty(user)&& StringUtils.isNotEmpty(user.getRealName())){
+                entity.setManagerName(user.getRealName());
             }
         }
         BladeUser user = AuthUtil.getUser();
         if (ObjectUtil.isNotEmpty(user)&& StringUtils.isNotEmpty(user.getUserName())){
-            entity.setCreateUserName(user.getUserName());
-            entity.setUpdateUserName(user.getUserName());
+            entity.setCreateUserName(user.getNickName());
+            entity.setUpdateUserName(user.getNickName());
         }
         planService.save(entity);
     }

hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/AccessTaskV4ServiceImpl.java

@@ -128,10 +128,10 @@ public class AccessTaskV4ServiceImpl implements AccessTaskV4Service {
         List<OperAccessMaterialEntity> materialEntityList = JSONObject.parseArray(JSON.toJSONString(entity.getAccessMaterials()), OperAccessMaterialEntity.class);
         if (ObjectUtil.isNotEmpty(entity.getHandler())){
             User user = UserCache.getUser(entity.getHandler());
-            if (ObjectUtil.isNotEmpty(user)&& StringUtils.isNotEmpty(user.getName())){
-                entity.setHandlerName(user.getName());
-                entity.setCreateUserName(user.getName());
-                entity.setUpdateUserName(user.getName());
+            if (ObjectUtil.isNotEmpty(user)&& StringUtils.isNotEmpty(user.getRealName())){
+                entity.setHandlerName(user.getRealName());
+                entity.setCreateUserName(user.getRealName());
+                entity.setUpdateUserName(user.getRealName());
             }
         }
         taskService.save(entity);

hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/OperAccessStatisticsServiceImpl.java

@@ -46,14 +46,14 @@ public class OperAccessStatisticsServiceImpl extends BaseServiceImpl<OperAccessS
 	public R doSave(OperAccessStatisticsDTO req) {
 		if (ObjectUtil.isNotEmpty(req.getManager())){
 			User user = UserCache.getUser(req.getManager());
-			if (ObjectUtil.isNotEmpty(user)&& StringUtils.isNotEmpty(user.getName())){
-				req.setManagerName(user.getName());
+			if (ObjectUtil.isNotEmpty(user)&& StringUtils.isNotEmpty(user.getRealName())){
+				req.setManagerName(user.getRealName());
 			}
 		}
 		BladeUser user = AuthUtil.getUser();
-		if (ObjectUtil.isNotEmpty(user)&& StringUtils.isNotEmpty(user.getUserName())){
-			req.setCreateUserName(user.getUserName());
-			req.setUpdateUserName(user.getUserName());
+		if (ObjectUtil.isNotEmpty(user)&& StringUtils.isNotEmpty(user.getNickName())){
+			req.setCreateUserName(user.getNickName());
+			req.setUpdateUserName(user.getNickName());
 		}
 		boolean save = super.save(req);
 		return R.status(save);

hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/OperAccessTaskServiceImpl.java

@@ -111,14 +111,14 @@ public class OperAccessTaskServiceImpl extends BaseServiceImpl<OperAccessTaskMap
         req.setCode("TASK" + DateUtil.format(DateUtil.now(), DateUtil.PATTERN_DATETIME_MINI) + new DecimalFormat("###").format(RandomUtils.nextInt(0, 999)));
         if (ObjectUtil.isNotEmpty(req.getHandler())){
             User user = UserCache.getUser(req.getHandler());
-            if (ObjectUtil.isNotEmpty(user)&& StringUtils.isNotEmpty(user.getName())){
-                req.setHandlerName(user.getName());
+            if (ObjectUtil.isNotEmpty(user)&& StringUtils.isNotEmpty(user.getRealName())){
+                req.setHandlerName(user.getRealName());
             }
         }
         BladeUser user = AuthUtil.getUser();
-        if (ObjectUtil.isNotEmpty(user)&& StringUtils.isNotEmpty(user.getUserName())){
-            req.setCreateUserName(user.getUserName());
-            req.setUpdateUserName(user.getUserName());
+        if (ObjectUtil.isNotEmpty(user)&& StringUtils.isNotEmpty(user.getNickName())){
+            req.setCreateUserName(user.getNickName());
+            req.setUpdateUserName(user.getNickName());
         }
         List<OperAccessMaterialEntity> materialEntityList = JSONObject.parseArray(JSON.toJSONString(req.getAccessMaterials()), OperAccessMaterialEntity.class);
         if (super.save(req)) {

hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/wrapper/AreaMapWrapper.java

@@ -26,7 +26,7 @@ public class AreaMapWrapper extends BaseEntityWrapper<AreaMapEntity, AreaMapVo>
 			return vo;
 		}
 		assert vo != null;
-		vo.setUserName(createUser.getName());
+		vo.setUserName(createUser.getRealName());
 		return vo;
 	}
 }

hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/impl/DefectCheckServiceImpl.java

@@ -101,8 +101,8 @@ public class DefectCheckServiceImpl extends BaseServiceImpl<OperPhenomenonMapper
         }
         if (ObjectUtil.isNotEmpty(entity.getFinder())&&StringUtils.isBlank(entity.getFinderName())){
             User user = UserCache.getUser(entity.getFinder());
-            if (ObjectUtil.isNotEmpty(user)&&StringUtils.isNotBlank(user.getName())) {
-                entity.setFinderName(user.getName());
+            if (ObjectUtil.isNotEmpty(user)&&StringUtils.isNotBlank(user.getRealName())) {
+                entity.setFinderName(user.getRealName());
             }
         }
         if (StringUtils.isNotBlank(AuthUtil.getUserName())){

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

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(",")));
 		}

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(",")));
 		}

hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyMainServiceImpl.java

@@ -1264,7 +1264,7 @@ public class ImsDutyMainServiceImpl extends BaseServiceImpl<ImsDutyMainMapper, I
 				}
 				User managerUser = UserCache.getUser(Long.valueOf(dutyMainInfoVo.getManagerId()));
 				if (ObjectUtil.isNotEmpty(managerUser)) {
-					dutyMainInfoVo.setManagerName(managerUser.getName());
+					dutyMainInfoVo.setManagerName(managerUser.getRealName());
 					dutyMainInfoVo.setManagerPhone(managerUser.getPhone());
 				}
 
@@ -1294,7 +1294,7 @@ public class ImsDutyMainServiceImpl extends BaseServiceImpl<ImsDutyMainMapper, I
 					vo.setCorryInfo(corryVo);
 					User carryManagerUser = UserCache.getUser(Long.valueOf(corryVo.getManagerId()));
 					if (ObjectUtil.isNotEmpty(carryManagerUser)) {
-						corryVo.setManagerName(carryManagerUser.getName());
+						corryVo.setManagerName(carryManagerUser.getRealName());
 						corryVo.setManagerPhone(carryManagerUser.getPhone());
 					}
 				}
@@ -1359,7 +1359,7 @@ public class ImsDutyMainServiceImpl extends BaseServiceImpl<ImsDutyMainMapper, I
 			// 负责人
 			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 上网
@@ -1657,9 +1657,9 @@ public class ImsDutyMainServiceImpl extends BaseServiceImpl<ImsDutyMainMapper, I
                 User user = restUserList.get(j);
                 if (ObjectUtil.isNotEmpty(user)) {
                     if (j == restUserList.size() - 1) {
-                        personNames += user.getName();
+                        personNames += user.getRealName();
                     } else {
-                        personNames += user.getName() + "、";
+                        personNames += user.getRealName() + "、";
                     }
                 }
             }
@@ -1732,7 +1732,7 @@ public class ImsDutyMainServiceImpl extends BaseServiceImpl<ImsDutyMainMapper, I
 		// 负责人
 		User user = UserCache.getUser(Long.valueOf(dutyMainInfoVo.getManagerId()));
 		if (ObjectUtil.isNotEmpty(user)) {
-			dutyInfoVo.setManagerName(user.getName());
+			dutyInfoVo.setManagerName(user.getRealName());
 			dutyInfoVo.setManagerPhone(user.getPhone());
 		}
 		// 发电量
@@ -1758,7 +1758,7 @@ public class ImsDutyMainServiceImpl extends BaseServiceImpl<ImsDutyMainMapper, I
 		// 负责人
 		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);
@@ -1771,7 +1771,7 @@ public class ImsDutyMainServiceImpl extends BaseServiceImpl<ImsDutyMainMapper, I
         if (ObjectUtil.isNotEmpty(user)) {
             AuditVo auditVo = new AuditVo();
             auditVo.setPersonId(personId);
-            auditVo.setPersonName(user.getName());
+            auditVo.setPersonName(user.getRealName());
             auditVo.setPhone(user.getPhone());
             return auditVo;
         }

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

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

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(createUser.getName());
+		vo.setUserName(createUser.getRealName());
 		vo.setAscriptionUser(entity.getCreateUser());
 		return vo;
 	}

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

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

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

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

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

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

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

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

hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/HydropowerServiceImpl.java

@@ -1860,7 +1860,7 @@ public class HydropowerServiceImpl implements HydropowerService {
 		if (ObjectUtil.isEmpty(user)) {
 			return "";
 		}
-		return user.getName();
+		return user.getRealName();
 	}
 
 	/**
@@ -1883,7 +1883,7 @@ public class HydropowerServiceImpl implements HydropowerService {
 			if (ObjectUtil.isEmpty(user)) {
 				continue;
 			}
-			builder.append(user.getName()).append(",");
+			builder.append(user.getRealName()).append(",");
 		}
 		if(builder.length() <= 0){
 			return "";

hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/WindHomeServiceImpl.java

@@ -721,7 +721,7 @@ public class WindHomeServiceImpl implements WindHomeService {
         if (ObjectUtil.isEmpty(user)) {
             return "";
         }
-        return user.getName();
+        return user.getRealName();
     }
 
     /**
@@ -744,7 +744,7 @@ public class WindHomeServiceImpl implements WindHomeService {
             if (ObjectUtil.isEmpty(user)) {
                 continue;
             }
-            builder.append(user.getName()).append(",");
+            builder.append(user.getRealName()).append(",");
         }
         if(builder.length() <= 0){
             return "";

hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/controller/OperMaintenancePlanController.java

@@ -67,14 +67,14 @@ public class OperMaintenancePlanController extends BladeController {
 		req.setTaskType("1");
 		if (ObjectUtil.isNotEmpty(req.getDisposer())){
 			User user = UserCache.getUser(req.getDisposer());
-			if (ObjectUtil.isNotEmpty(user)&& StringUtils.isNotEmpty(user.getName())){
-				req.setDisposerName(user.getName());
+			if (ObjectUtil.isNotEmpty(user)&& StringUtils.isNotEmpty(user.getRealName())){
+				req.setDisposerName(user.getRealName());
 			}
 		}
 		BladeUser user = AuthUtil.getUser();
-		if (ObjectUtil.isNotEmpty(user)&& StringUtils.isNotEmpty(user.getUserName())){
-			req.setCreateUserName(user.getUserName());
-			req.setUpdateUserName(user.getUserName());
+		if (ObjectUtil.isNotEmpty(user)&& StringUtils.isNotEmpty(user.getNickName())){
+			req.setCreateUserName(user.getNickName());
+			req.setUpdateUserName(user.getNickName());
 		}
 		planService.save(req);
 		return R.data(req);

hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/MaintenanceServiceImpl.java

@@ -348,8 +348,8 @@ public class MaintenanceServiceImpl implements MaintenanceService {
                 String disposerName="";
                 for (int i = 0; i < split.length; i++) {
                     User user = UserCache.getUser(Long.valueOf(split[i]));
-                    if (ObjectUtil.isNotEmpty(user)&&StringUtils.isNotBlank(user.getName())){
-                        disposerName=disposerName+user.getName();
+                    if (ObjectUtil.isNotEmpty(user)&&StringUtils.isNotBlank(user.getRealName())){
+                        disposerName=disposerName+user.getRealName();
                     }
                 }
                 taskEntity.setDisposer(userId.replaceAll("\\^", ","));

hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/schedule/OperPersonalCreateMonthReport.java

@@ -75,7 +75,7 @@ public class OperPersonalCreateMonthReport {
 					}
 				}
 				else{
-					log.info("{}已生成月报",user.getName());
+					log.info("{}已生成月报",user.getRealName());
 				}
 			}
 		});

hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/service/impl/OperStationMonthReportServiceImpl.java

@@ -554,7 +554,7 @@ public class OperStationMonthReportServiceImpl implements IOperStationMonthRepor
         List<User> userListByRoleAlias = userClient.relationUserListByRoleAlias("200000", deptId, PROJECT_MANAGER).getData();
         if (CollectionUtil.isNotEmpty(userListByRoleAlias)){
             User user = userListByRoleAlias.get(0);
-            map.put("manager", user.getName());
+            map.put("manager", user.getRealName());
         }else {
             map.put("manager","");
         }

hzims-service/operational/src/main/java/com/hnac/hzims/operational/workOrder/service/impl/DistributeWorkOrderServiceImpl.java

@@ -82,7 +82,7 @@ public class DistributeWorkOrderServiceImpl implements IDistributeWorkOrderServi
 		publisher.setContactAddress("123123");
 		publisher.setContactName("123123");
 		publisher.setContactPhone(user.getPhone());
-		publisher.setPublisher(user.getName());
+		publisher.setPublisher(user.getRealName());
 		publisher.setPublisherScale("123123");
 		orderPackageDto.setPublisher(publisher);
 		SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java

@@ -411,9 +411,9 @@ public class TicketProcessServiceImpl implements TicketProcessService {
                     log.info("工作票负责人更新变更");
                     workTicketPrincipalChangeService.updateByTicketId(workTicketPrincipalChange);
                 }
-                log.info("工作负责人变更 原来的负责人 {}，变更为 {}", user.getName(), newUser.getName());
+                log.info("工作负责人变更 原来的负责人 {}，变更为 {}", user.getRealName(), newUser.getRealName());
                 workTicket.setPrincipal(workTicketPrincipalChange.getChangePrincipal());
-                workTicket.setPrincipalName(newUser.getName());
+                workTicket.setPrincipalName(newUser.getRealName());
                 //更新工作票
                 workTicketInfoService.updateById(workTicket);
             }
@@ -591,8 +591,8 @@ public class TicketProcessServiceImpl implements TicketProcessService {
                 //下一个审批人
                 User stepUser = UserCache.getUser(taskUser);
                 if (stepUser != null) {
-                    flowDescription = "审批中,当前环节是".concat(response.getTaskName()).concat(",待").concat(stepUser.getName()).concat("审批");
-                    workTicket.setNextStepOperator(stepUser.getName());
+                    flowDescription = "审批中,当前环节是".concat(response.getTaskName()).concat(",待").concat(stepUser.getRealName()).concat("审批");
+                    workTicket.setNextStepOperator(stepUser.getRealName());
                 }
             } else {
                 workTicket.setNextStepOperator(null);
@@ -855,7 +855,7 @@ public class TicketProcessServiceImpl implements TicketProcessService {
         Long principal = workTicket.getPrincipal();
         if (ObjectUtils.isNotEmpty(principal)) {
             User user = UserCache.getUser(principal);
-            return user == null ? null : user.getName();
+            return user == null ? null : user.getRealName();
         }
         return workTicket.getPrincipalManual();
     }
@@ -872,7 +872,7 @@ public class TicketProcessServiceImpl implements TicketProcessService {
             String[] splits = classGroupMembers.split(",");
             for (String split : splits) {
                 User user = UserCache.getUser(Long.valueOf(split));
-                stringJoiner.add(user != null ? user.getName() : "");
+                stringJoiner.add(user != null ? user.getRealName() : "");
             }
         }
         String classGroupMembersManual = workTicket.getClassGroupMembersManual();

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketInfoServiceImpl.java

@@ -275,7 +275,7 @@ public class WorkTicketInfoServiceImpl extends BaseServiceImpl<WorkTicketInfoMap
         workTicketInfoVOIPage.getRecords().forEach(item -> {
             User user = UserCache.getUser(item.getCreateUser());
             if (user != null) {
-                item.setCreateUserName(user.getName());
+                item.setCreateUserName(user.getRealName());
             }
         });
 
@@ -978,23 +978,23 @@ public class WorkTicketInfoServiceImpl extends BaseServiceImpl<WorkTicketInfoMap
         //赋值签发人
         if (workTicketInfo.getSigner() != null) {
             User user = UserCache.getUser(workTicketInfo.getSigner());
-            workTicketInfo.setSignerName(user == null ? null : user.getName());
+            workTicketInfo.setSignerName(user == null ? null : user.getRealName());
         }
 
         if (workTicketInfo.getSigner() != null && workTicketInfo.getSignerName() == null) {
             User user = UserCache.getUser(workTicketInfo.getSigner());
-            workTicketInfo.setSignerName(user == null ? null : user.getName());
+            workTicketInfo.setSignerName(user == null ? null : user.getRealName());
         }
 
         //赋值许可人名称
         if (workTicketInfo.getLicensor() != null) {
             User user = UserCache.getUser(workTicketInfo.getLicensor());
-            workTicketInfo.setLicensorName(user == null ? null : user.getName());
+            workTicketInfo.setLicensorName(user == null ? null : user.getRealName());
         }
 
         if (workTicketInfo.getLicensor() != null && workTicketInfo.getLicensorName() == null) {
             User user = UserCache.getUser(workTicketInfo.getLicensor());
-            workTicketInfo.setLicensorName(user == null ? null : user.getName());
+            workTicketInfo.setLicensorName(user == null ? null : user.getRealName());
         }
         // 工作负责人名称
         workTicketInfo.setPrincipalName(Optional.ofNullable(workTicketInfo.getPrincipalManual()).filter(StringUtil::isNotBlank).orElse(workTicketInfo.getPrincipalName()));
@@ -1002,12 +1002,12 @@ public class WorkTicketInfoServiceImpl extends BaseServiceImpl<WorkTicketInfoMap
         // 负责值班负责人
         if (workTicketInfo.getWatchPrincipal() != null) {
             User user = UserCache.getUser(workTicketInfo.getWatchPrincipal());
-            workTicketInfo.setWatchPrincipalName(user == null ? null : user.getName());
+            workTicketInfo.setWatchPrincipalName(user == null ? null : user.getRealName());
         }
 
         if (workTicketInfo.getWatchPrincipal() != null && workTicketInfo.getWatchPrincipalName() == null) {
             User user = UserCache.getUser(workTicketInfo.getWatchPrincipal());
-            workTicketInfo.setWatchPrincipalName(user == null ? null : user.getName());
+            workTicketInfo.setWatchPrincipalName(user == null ? null : user.getRealName());
         }
 
 
@@ -1022,7 +1022,7 @@ public class WorkTicketInfoServiceImpl extends BaseServiceImpl<WorkTicketInfoMap
                     boolean matches = classGroupMember.matches("[0-9]+");
                     if (matches) {
                         User user = UserCache.getUser(Long.valueOf(classGroupMember));
-                        String name = user == null ? null : user.getName();
+                        String name = user == null ? null : user.getRealName();
                         if (StringUtils.isNotBlank(name)) {
                             sb.append(name).append(",");
                         }
@@ -1042,7 +1042,7 @@ public class WorkTicketInfoServiceImpl extends BaseServiceImpl<WorkTicketInfoMap
         //负责人名称
         if (workTicketInfo.getPrincipalName() == null && workTicketInfo.getPrincipal() != null) {
             User user = UserCache.getUser(workTicketInfo.getPrincipal());
-            workTicketInfo.setPrincipalName(user == null ? "" : user.getName());
+            workTicketInfo.setPrincipalName(user == null ? "" : user.getRealName());
         }