yangshj
/
zhongwei
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

zhongwei
yang_shj 10 months ago
parent
26488999ce
commit
73bbd2eb85
10 changed files with 40 additions and 40 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/impl/DutyServiceImpl.java
  2. 2
      hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/feign/DutyGroupClient.java
  3. 8
      hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyChangeServiceImpl.java
  4. 4
      hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyEmergencyServiceImpl.java
  5. 10
      hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyGroupServiceImpl.java
  6. 12
      hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyMainServiceImpl.java
  7. 22
      hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyRecServiceImpl.java
  8. 2
      hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/scheduled/SafeToolTypePushUserTask.java
  9. 2
      hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/wrapper/ImsMonAlarmInfoWrapper.java
  10. 10
      hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/OperationTicketServiceImpl.java

8
hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/impl/DutyServiceImpl.java
Unescape View File

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

2
hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/feign/DutyGroupClient.java
Unescape View File

@ -47,7 +47,7 @@ public class DutyGroupClient implements IDutyGroupClient {
if(CollectionUtil.isEmpty(persons)){
return group;
}
List<String> personNames = persons.stream().filter(o-> !charge.equals(o.getPersonId())).map(o-> UserCache.getUser(o.getPersonId()).getName()).collect(Collectors.toList());
List<String> personNames = persons.stream().filter(o-> !charge.equals(o.getPersonId())).map(o-> UserCache.getUser(o.getPersonId()).getRealName()).collect(Collectors.toList());
if(CollectionUtil.isEmpty(personNames)){
group.setRepairPersonnelSum(0);
return group;

8
hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyChangeServiceImpl.java
Unescape View File

@ -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);
ImsSchedulingVo imsSchedulingVo = dutyMainService.getByIdOneV2(detail.getApplyDutyId());

4
hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyEmergencyServiceImpl.java
Unescape View File

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

10
hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyGroupServiceImpl.java
Unescape View File

@ -166,8 +166,8 @@ public class ImsDutyGroupServiceImpl extends BaseServiceImpl<ImsDutyGroupMapper,
imsDutyGroupVO.setId(entity.getId());
imsDutyGroupVO.setManagerId(entity.getManagerId());
User user = UserCache.getUser(entity.getManagerId());
if (ObjectUtil.isNotEmpty(user)&&StringUtils.isNotBlank(user.getName())){
imsDutyGroupVO.setManagerName(user.getName());
if (ObjectUtil.isNotEmpty(user)&&StringUtils.isNotBlank(user.getRealName())){
imsDutyGroupVO.setManagerName(user.getRealName());
}
List<ImsDutyGroupPVO> imsDutyGroupPVOS = imsDutyGroupPService.listByGroupId(entity.getId());
if (CollectionUtil.isNotEmpty(imsDutyGroupPVOS)){
@ -176,7 +176,7 @@ public class ImsDutyGroupServiceImpl extends BaseServiceImpl<ImsDutyGroupMapper,
String name="";
for (int i1 = 0; i1 < userIds.size(); i1++) {
if(ObjectUtil.isNotEmpty(entity.getManagerId())&&!entity.getManagerId().equals(userIds.get(i1))){
name = name + UserCache.getUser(userIds.get(i1)).getName();
name = name + UserCache.getUser(userIds.get(i1)).getRealName();
if (i1 != userIds.size() - 1) {
name = name + ",";
}
@ -244,8 +244,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());

12
hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyMainServiceImpl.java
Unescape View File

@ -809,9 +809,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() + "、");
}
}
}
@ -868,7 +868,7 @@ public class ImsDutyMainServiceImpl extends BaseServiceImpl<ImsDutyMainMapper, I
if (ObjectUtil.isNotEmpty(user)) {
vo.setUserId(s);
if (ObjectUtil.isNotEmpty(user)) {
vo.setUserName(user.getName());
vo.setUserName(user.getRealName());
}
vo.setId(id);
list.add(vo);
@ -894,8 +894,8 @@ public class ImsDutyMainServiceImpl extends BaseServiceImpl<ImsDutyMainMapper, I
R<User> user = userClient.userInfoById(Long.valueOf(s));
if (user.isSuccess() && ObjectUtil.isNotEmpty(user.getData())) {
vo.setUserId(s);
if (ObjectUtil.isNotEmpty(user.getData().getName())) {
vo.setUserName(user.getData().getName());
if (ObjectUtil.isNotEmpty(user.getData().getRealName())) {
vo.setUserName(user.getData().getRealName());
}
vo.setId(id);
list.add(vo);
@ -1083,7 +1083,7 @@ public class ImsDutyMainServiceImpl extends BaseServiceImpl<ImsDutyMainMapper, I
dutyReportVO.setGroupName(imsDutyGroupEntity.getGroupName());
User user = UserCache.getUser(imsDutyGroupEntity.getManagerId());
if (ObjectUtil.isNotEmpty(user)){
dutyReportVO.setManagerName(user.getName());
dutyReportVO.setManagerName(user.getRealName());
}
dutyReportVO.setDutyNum(v.size());
//获取值班ID

22
hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyRecServiceImpl.java
Unescape View File

@ -342,8 +342,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, PATTERN_DATETIME);
@ -552,11 +552,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("没有找到接班对象值班信息，请联系管理人员，尽快进行排班！！！！");
}
@ -773,7 +773,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()) {
@ -834,7 +834,7 @@ public class ImsDutyRecServiceImpl extends BaseServiceImpl<ImsDutyRecMapper, Ims
}
}
}
remondingCarryV2(carryMainentity.getDutyDate(),2, carryManagerId, user.getData().getName(), classEntity, null, carryTenantId, carryCreateDept, carryMainentity.getId(), carryMainentity.getCreateUser());//提醒接班人
remondingCarryV2(carryMainentity.getDutyDate(),2, carryManagerId, user.getData().getRealName(), classEntity, null, carryTenantId, carryCreateDept, carryMainentity.getId(), carryMainentity.getCreateUser());//提醒接班人
}
}
}
@ -1157,7 +1157,7 @@ public class ImsDutyRecServiceImpl extends BaseServiceImpl<ImsDutyRecMapper, Ims
messagePushRecordDto.setTaskId(taskId);
messagePushRecordDto.setTenantId(tenantId);
messagePushRecordDto.setPusher(admin.getId().toString());
messagePushRecordDto.setPusherName(admin.getName());
messagePushRecordDto.setPusherName(admin.getRealName());
messagePushRecordDto.setAccount(admin.getId().toString());
messagePushRecordDto.setContent(" 负责人"+userName + datyTime+ "("+classEntity.getStartTime()
+ "-" + classEntity.getEndTime()+")"+" 的值班,目前已交班延迟,请尽快联系该负责人进行交班工作!");
@ -1620,7 +1620,7 @@ public class ImsDutyRecServiceImpl extends BaseServiceImpl<ImsDutyRecMapper, Ims
ImsDutyGroupEntity groupEntity = imsDutyGroupService.getById(dutyGroupId);
User manager = UserCache.getUser(groupEntity.getManagerId());
if (cn.hutool.core.util.ObjectUtil.isNotEmpty(manager)){
managerName=manager.getName();
managerName=manager.getRealName();
}
}else {
ImsDutyMainPersonEntity dutyMainPerson = imsDutyMainPersonService.getOne(new LambdaQueryWrapper<ImsDutyMainPersonEntity>() {{
@ -1629,7 +1629,7 @@ public class ImsDutyRecServiceImpl extends BaseServiceImpl<ImsDutyRecMapper, Ims
}});
User manager = UserCache.getUser(dutyMainPerson.getDutyChargePerson());
if (cn.hutool.core.util.ObjectUtil.isNotEmpty(manager)){
managerName=manager.getName();
managerName=manager.getRealName();
}
}
return managerName;
@ -1643,9 +1643,9 @@ public class ImsDutyRecServiceImpl extends BaseServiceImpl<ImsDutyRecMapper, Ims
User user = UserCache.getUser(Long.valueOf(split[j]));
if (org.springblade.core.tool.utils.ObjectUtil.isNotEmpty(user)) {
if (j == split.length - 1) {
handNumber= handNumber + user.getName();
handNumber= handNumber + user.getRealName();
} else {
handNumber= handNumber + user.getName()+ "、";
handNumber= handNumber + user.getRealName()+ "、";
}
}
}

2
hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/scheduled/SafeToolTypePushUserTask.java
Unescape View File

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

2
hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/wrapper/ImsMonAlarmInfoWrapper.java
Unescape View File

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

10
hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/OperationTicketServiceImpl.java
Unescape View File

@ -201,8 +201,8 @@ public class OperationTicketServiceImpl implements OperationTicketService {
//填充许可人
if(ObjectUtil.isNotEmpty(standardTicketInfoVo.getPrincipal())) {
User principal = UserCache.getUser(standardTicketInfoVo.getPrincipal());
if (ObjectUtil.isNotEmpty(principal)&&StringUtils.isNotBlank(principal.getName())){
newStandardTicketInfoEntity.setIssueOrderPersonName(principal.getName());
if (ObjectUtil.isNotEmpty(principal)&&StringUtils.isNotBlank(principal.getRealName())){
newStandardTicketInfoEntity.setIssueOrderPersonName(principal.getRealName());
}
}
standardTicketInfoService.updateById(newStandardTicketInfoEntity);
@ -415,20 +415,20 @@ public class OperationTicketServiceImpl implements OperationTicketService {
if(ObjectUtil.isNotEmpty(standardTicketInfoVo.getIssueOrderPerson())) {
User issueOrderPerson = UserCache.getUser(standardTicketInfoVo.getIssueOrderPerson());
if (ObjectUtil.isNotEmpty(issueOrderPerson)){
standardTicketInfo.setIssueOrderPersonName(issueOrderPerson.getName());
standardTicketInfo.setIssueOrderPersonName(issueOrderPerson.getRealName());
}
}
if(ObjectUtil.isNotEmpty(standardTicketInfoVo.getAccessOrderPerson())) {
User accessOrderPerson = UserCache.getUser(standardTicketInfoVo.getAccessOrderPerson());
if (ObjectUtil.isNotEmpty(accessOrderPerson)){
standardTicketInfo.setAccessOrderPersonName(accessOrderPerson.getName());
standardTicketInfo.setAccessOrderPersonName(accessOrderPerson.getRealName());
}
}
if(ObjectUtil.isNotEmpty(standardTicketInfoVo.getGuardian())) {
User guardian = UserCache.getUser(standardTicketInfoVo.getGuardian());
if (ObjectUtil.isNotEmpty(guardian)){
standardTicketInfo.setGuardianName(guardian.getName());
standardTicketInfo.setGuardianName(guardian.getRealName());
}
}

Write Preview
Loading…
Cancel
Save