From 14cb85409c91493934c2e153a3acb2be7f3dc4b0 Mon Sep 17 00:00:00 2001 From: hzj <826100833@qq.com> Date: Wed, 27 Dec 2023 14:40:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../njcn/csdevice/service/impl/CsDeviceUserPOServiceImpl.java | 2 +- .../csdevice/service/impl/CsEquipmentProcessPOServiceImpl.java | 2 +- .../njcn/csdevice/service/impl/CsEventSendMsgServiceImpl.java | 2 +- .../csharmonic/service/impl/CsConfigurationServiceImpl.java | 2 +- .../com/njcn/cssystem/service/impl/CsFeedbackServiceImpl.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDeviceUserPOServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDeviceUserPOServiceImpl.java index c215878..f13f3cb 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDeviceUserPOServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDeviceUserPOServiceImpl.java @@ -381,7 +381,7 @@ public class CsDeviceUserPOServiceImpl extends ServiceImpl collect = list.stream().map(CsDeviceUserPO::getSubUserId).distinct().collect(Collectors.toList()); - List data = userFeignClient.getUserByIdList(collect).getData(); + List data = userFeignClient.appuserByIdList(collect).getData(); String primaryUserId = list.get(0).getPrimaryUserId(); List subUser = data.stream().filter(temp -> !Objects.equals(temp.getId(), primaryUserId)).collect(Collectors.toList()); List primaryUser = data.stream().filter(temp -> Objects.equals(temp.getId(), primaryUserId)).collect(Collectors.toList()); diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentProcessPOServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentProcessPOServiceImpl.java index 7481406..c846846 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentProcessPOServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentProcessPOServiceImpl.java @@ -57,7 +57,7 @@ public class CsEquipmentProcessPOServiceImpl extends ServiceImpl collect1 = result.getRecords().stream().map(CsEquipmentProcessDTO::getOperator).distinct().collect(Collectors.toList()); Map collect2; if(!CollectionUtils.isEmpty(collect1)){ - List userTem = userFeignClient.getUserByIdList(collect1).getData(); + List userTem = userFeignClient.appuserByIdList(collect1).getData(); collect2 = userTem.stream().collect(Collectors.toMap(User::getId, User::getName, (e1, e2) -> e1 + "," + e2)); } else { diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEventSendMsgServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEventSendMsgServiceImpl.java index ab358ed..da2194d 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEventSendMsgServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEventSendMsgServiceImpl.java @@ -45,7 +45,7 @@ public class CsEventSendMsgServiceImpl extends ServiceImpl collect1 = result.getRecords().stream().map(CsEventSendMsgVO::getUserId).distinct().collect(Collectors.toList()); Map collect2; if(!CollectionUtils.isEmpty(collect1)){ - List userTem = userFeignClient.getUserByIdList(collect1).getData(); + List userTem = userFeignClient.appuserByIdList(collect1).getData(); collect2 = userTem.stream().collect(Collectors.toMap(User::getId, User::getName, (e1, e2) -> e1 + "," + e2)); } else { diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsConfigurationServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsConfigurationServiceImpl.java index 72d43e7..2273225 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsConfigurationServiceImpl.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsConfigurationServiceImpl.java @@ -126,7 +126,7 @@ public class CsConfigurationServiceImpl extends ServiceImpl collect1 = csConfigurationPOPage.getRecords().stream().map(CsConfigurationPO::getCreateBy).collect(Collectors.toList()); Map collect2; if(!CollectionUtils.isEmpty(collect1)){ - List data = userFeignClient.getUserByIdList(collect1).getData(); + List data = userFeignClient.appuserByIdList(collect1).getData(); collect2 = data.stream().collect(Collectors.toMap(User::getId, User::getName, (e1, e2) -> e1 + "," + e2)); } else { diff --git a/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/service/impl/CsFeedbackServiceImpl.java b/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/service/impl/CsFeedbackServiceImpl.java index bb4a99d..c3751ca 100644 --- a/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/service/impl/CsFeedbackServiceImpl.java +++ b/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/service/impl/CsFeedbackServiceImpl.java @@ -134,7 +134,7 @@ public class CsFeedbackServiceImpl extends ServiceImpl collect1 = list1.stream().map(CsFeedbackChatPO::getUserId).distinct().collect(Collectors.toList()); Map collect2; if(!CollectionUtils.isEmpty(collect1)){ - List userTem = userFeignClient.getUserByIdList(collect1).getData(); + List userTem = userFeignClient.appuserByIdList(collect1).getData(); collect2 = userTem.stream().collect(Collectors.toMap(User::getId, User::getName, (e1, e2) -> e1 + "," + e2)); } else {